December 2005 - Wine-Commits

Huw Davies : x11drv: Get the visual for the GLXPixmap from the current pixel format.
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: 8b7098794d33cec06124a37dcdc33249a33a0b5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b7098794d33cec06124a37… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 16 19:29:52 2005 +0100 x11drv: Get the visual for the GLXPixmap from the current pixel format. --- dlls/x11drv/opengl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index 3a400c1..c119e7c 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -588,13 +588,17 @@ XID create_glxpixmap(X11DRV_PDEVICE *phy XVisualInfo *vis; XVisualInfo template; int num; + GLXFBConfig *cfgs; wine_tsx11_lock(); - template.visualid = XVisualIDFromVisual(visual); + cfgs = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &num); + pglXGetFBConfigAttrib(gdi_display, cfgs[physDev->current_pf - 1], GLX_VISUAL_ID, (int *)&template.visualid); + vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); XFree(vis); + XFree(cfgs); wine_tsx11_unlock(); TRACE("return %lx\n", ret); return ret;

1 0

Alexandre Julliard : Take advantage of the __EXCEPT_PAGE_FAULT macro.
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: ae964ac801b3077f5361559abd6645d21fc35d1f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae964ac801b3077f5361559… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 17:17:57 2005 +0100 Take advantage of the __EXCEPT_PAGE_FAULT macro. --- dlls/crypt32/cert.c | 10 ---- dlls/crypt32/encode.c | 98 ++++++++++++++++++++------------------------ dlls/dbghelp/msc.c | 9 ---- dlls/ddraw/main.c | 10 ---- dlls/kernel/atom.c | 10 ---- dlls/kernel/computername.c | 16 ++----- dlls/kernel/file.c | 9 ---- dlls/kernel/heap.c | 20 ++------- dlls/kernel/ne_module.c | 10 ---- dlls/kernel/resource.c | 13 +----- dlls/kernel/string.c | 24 ++++------- dlls/kernel/virtual.c | 16 ++----- dlls/msvcrt/cpp.c | 14 +----- dlls/ntdll/debugtools.c | 12 +---- dlls/ntdll/loader.c | 10 ---- dlls/ntdll/relay.c | 10 ---- dlls/ntdll/resource.c | 13 +----- dlls/ntdll/sec.c | 12 +---- dlls/ole32/rpc.c | 9 ---- dlls/user/cursoricon.c | 13 ------ dlls/user/lstr.c | 11 +---- dlls/winmm/driver.c | 2 - dlls/winmm/lolvldrv.c | 2 - 23 files changed, 92 insertions(+), 261 deletions(-)

1 0

Alexandre Julliard : Exception handling: Added a magic __EXCEPT_PAGE_FAULT macro to make it
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: 324d86a3af69598631d2d6a6c27612f41991d8a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=324d86a3af69598631d2d6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 16:58:47 2005 +0100 Exception handling: Added a magic __EXCEPT_PAGE_FAULT macro to make it easier to handle the common case of trapping page faults. --- dlls/ntdll/exception.c | 8 +++++++- include/wine/exception.h | 4 ++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 47ed835..972ba0a 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -546,7 +546,13 @@ DWORD __wine_exception_handler( EXCEPTIO if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) return ExceptionContinueSearch; - if (wine_frame->u.filter) + + if (wine_frame->u.filter == (void *)1) /* special hack for page faults */ + { + if (record->ExceptionCode != EXCEPTION_ACCESS_VIOLATION) + return ExceptionContinueSearch; + } + else if (wine_frame->u.filter) { EXCEPTION_POINTERS ptrs; ptrs.ExceptionRecord = record; diff --git a/include/wine/exception.h b/include/wine/exception.h index cc03fdb..9586503 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -71,6 +71,7 @@ #define __EXCEPT(func) __except((func)(GetExceptionInformation())) #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); } #define __ENDTRY /*nothing*/ +#define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) #else /* USE_COMPILER_EXCEPTIONS */ @@ -122,6 +123,9 @@ typedef DWORD (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); +/* convenience handler for page fault exceptions */ +#define __EXCEPT_PAGE_FAULT __EXCEPT( (__WINE_FILTER)1 ) + #define WINE_EXCEPTION_FILTER(func) DWORD WINAPI func( EXCEPTION_POINTERS *__eptr ) #define WINE_FINALLY_FUNC(func) void WINAPI func( BOOL __normal )

1 0

Alexandre Julliard : We no longer need to handle EXCEPTION_PRIV_INSTRUCTION on page faults.
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: db7920bb44652245b82aba0c805aaa90eabf66f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db7920bb44652245b82aba0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 16:37:12 2005 +0100 We no longer need to handle EXCEPTION_PRIV_INSTRUCTION on page faults. --- dlls/kernel/heap.c | 3 --- dlls/kernel/ne_module.c | 3 +-- dlls/kernel/resource.c | 3 +-- dlls/ntdll/resource.c | 3 +-- dlls/ole32/rpc.c | 3 +-- dlls/user/lstr.c | 3 +-- 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index b30e457..9bb2807 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -72,13 +72,10 @@ static HANDLE systemHeap; /* globally /* filter for page-fault exceptions */ -/* It is possible for a bogus global pointer to cause a */ -/* page zero reference, so I include EXCEPTION_PRIV_INSTRUCTION too. */ static WINE_EXCEPTION_FILTER(page_fault) { switch (GetExceptionCode()) { case (EXCEPTION_ACCESS_VIOLATION): - case (EXCEPTION_PRIV_INSTRUCTION): return EXCEPTION_EXECUTE_HANDLER; default: return EXCEPTION_CONTINUE_SEARCH; diff --git a/dlls/kernel/ne_module.c b/dlls/kernel/ne_module.c index 4770587..c3572ae 100644 --- a/dlls/kernel/ne_module.c +++ b/dlls/kernel/ne_module.c @@ -92,8 +92,7 @@ static HMODULE16 NE_GetModuleByFilename( static WINE_EXCEPTION_FILTER(page_fault) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/kernel/resource.c b/dlls/kernel/resource.c index 7b91a2a..8964855 100644 --- a/dlls/kernel/resource.c +++ b/dlls/kernel/resource.c @@ -50,8 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); static WINE_EXCEPTION_FILTER(page_fault) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 8694917..7426128 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -53,8 +53,7 @@ static LANGID user_ui_language, system_u static WINE_EXCEPTION_FILTER(page_fault) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index d87b478..c57bab5 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -112,8 +112,7 @@ struct dispatch_params static WINE_EXCEPTION_FILTER(ole_filter) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_EXECUTE_HANDLER; } diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c index 9a34738..bc9ad46 100644 --- a/dlls/user/lstr.c +++ b/dlls/user/lstr.c @@ -45,8 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); /* filter for page-fault exceptions */ static WINE_EXCEPTION_FILTER(page_fault) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; }

1 0

Alexandre Julliard : ntdll: More compatible exception information for protection faults.
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: 07f84d0458c07ffd455863cdd0c59abfccbdd98d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07f84d0458c07ffd455863c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 16:27:39 2005 +0100 ntdll: More compatible exception information for protection faults. Added a bunch of test cases. --- dlls/ntdll/signal_i386.c | 80 +++++++++++++++ dlls/ntdll/tests/.gitignore | 1 dlls/ntdll/tests/Makefile.in | 1 dlls/ntdll/tests/exception.c | 223 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 302 insertions(+), 3 deletions(-) create mode 100644 dlls/ntdll/tests/exception.c

1 0

Oliver Stieber : wined3d: Vertex declaration cleanup.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: a57790f46a2b7c9e19b189016ee17df1cbd312ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a57790f46a2b7c9e19b1890… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Fri Dec 16 12:49:38 2005 +0100 wined3d: Vertex declaration cleanup. Clean up constants and the wine declaration when the vertex declaration is destroyed. --- dlls/wined3d/vertexdeclaration.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 74dce97..0f6cf9b 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -418,9 +418,11 @@ ULONG WINAPI IWineD3DVertexDeclarationIm TRACE("(%p) : Releasing from %ld\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This->pDeclaration8); - HeapFree(GetProcessHeap(), 0, This->pDeclaration9); - HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, This->pDeclaration8); + HeapFree(GetProcessHeap(), 0, This->pDeclaration9); + HeapFree(GetProcessHeap(), 0, This->pDeclarationWine); + HeapFree(GetProcessHeap(), 0, This->constants); + HeapFree(GetProcessHeap(), 0, This); } return ref; }

1 0

Oliver Stieber : wined3d: Allow NULL multi sample quality.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 8ff9a7eb55d1798c5797c646b6d6d41c8a12261b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ff9a7eb55d1798c5797c64… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Fri Dec 16 12:49:22 2005 +0100 wined3d: Allow NULL multi sample quality. Allow MultiSampleQuality to be passed as NULL, this is a requirement for DirectX 8 and lower. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba2bb8d..ee51e1b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1377,7 +1377,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create object->presentParms.BackBufferFormat = *(pPresentationParameters->BackBufferFormat); object->presentParms.BackBufferCount = *(pPresentationParameters->BackBufferCount); object->presentParms.MultiSampleType = *(pPresentationParameters->MultiSampleType); - object->presentParms.MultiSampleQuality = *(pPresentationParameters->MultiSampleQuality); + object->presentParms.MultiSampleQuality = NULL == pPresentationParameters->MultiSampleQuality ? 0 : *(pPresentationParameters->MultiSampleQuality); object->presentParms.SwapEffect = *(pPresentationParameters->SwapEffect); object->presentParms.hDeviceWindow = *(pPresentationParameters->hDeviceWindow); object->presentParms.Windowed = *(pPresentationParameters->Windowed);

1 0

Alexandre Julliard : Add -register hint in ntdll, kernel and msvcrt spec files.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 15430f6edaba9c31c2c799c9f181ea4bc7008a9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15430f6edaba9c31c2c799c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 12:44:58 2005 +0100 Add -register hint in ntdll, kernel and msvcrt spec files. --- dlls/kernel/kernel32.spec | 130 +++++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.spec | 12 ++-- dlls/ntdll/ntdll.spec | 8 +-- 3 files changed, 75 insertions(+), 75 deletions(-)

1 0

Alexandre Julliard : winebuild: Allow -register flag for Win32 too.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: db4c1561f2d707e68cc43702ab733d0a196f00e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db4c1561f2d707e68cc4370… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 12:44:16 2005 +0100 winebuild: Allow -register flag for Win32 too. This way it can be used as hint for the relay code. --- tools/winebuild/parser.c | 6 ------ tools/winebuild/winebuild.man.in | 2 +- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 00f1f4d..0e24a53 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -518,12 +518,6 @@ static int parse_spec_ordinal( int ordin odp->ordinal = ordinal; } - if (spec->type == SPEC_WIN32 && odp->flags & FLAG_REGISTER) - { - error( "-register flag not supported for Win32 entry points\n" ); - goto error; - } - if (odp->type == TYPE_STDCALL && !(odp->flags & FLAG_PRIVATE)) { if (!strcmp( odp->name, "DllRegisterServer" ) || diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index a682a10..6c9bafc 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -260,7 +260,7 @@ The function returns a 64-bit value (Win The entry point is only available on i386 platforms. .TP .B -register -The function uses CPU register to pass arguments (Win16 only). +The function uses CPU register to pass arguments. .TP .B -private The function cannot be imported from other dlls, it can only be

1 0

Juan Lang : crypt32: Implement CRLDistPoints encoding/decoding.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 628ede4783a9e474608773fc1598ce20f359724a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=628ede4783a9e474608773f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Dec 16 12:41:28 2005 +0100 crypt32: Implement CRLDistPoints encoding/decoding. - rewrite sequence decoding to support context-specific tags, and eliminate duplicated code - implement encoding and decoding of CRLDistPoints --- dlls/crypt32/encode.c | 788 ++++++++++++++++++++++++++++--------------- dlls/crypt32/tests/encode.c | 228 ++++++++++++ 2 files changed, 732 insertions(+), 284 deletions(-)

1 0

Stefan Leichter : shell32: Fix return value of PathProcessCommand.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: a4af4b95b5636a6202df2f0ea4d369551d7587cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4af4b95b5636a6202df2f0… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Fri Dec 16 12:41:11 2005 +0100 shell32: Fix return value of PathProcessCommand. --- dlls/shell32/shellpath.c | 16 +++++++++------- include/shlobj.h | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 80bb33c..e706dd9 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -700,7 +700,7 @@ BOOL WINAPI PathResolveAW( /************************************************************************* * PathProcessCommandA [SHELL32.653] */ -HRESULT WINAPI PathProcessCommandA ( +LONG WINAPI PathProcessCommandA ( LPCSTR lpszPath, LPSTR lpszBuff, DWORD dwBuffSize, @@ -708,14 +708,15 @@ HRESULT WINAPI PathProcessCommandA ( { FIXME("%s %p 0x%04lx 0x%04lx stub\n", lpszPath, lpszBuff, dwBuffSize, dwFlags); - strcpy(lpszBuff, lpszPath); - return 0; + if(!lpszPath) return -1; + if(lpszBuff) strcpy(lpszBuff, lpszPath); + return strlen(lpszPath); } /************************************************************************* * PathProcessCommandW */ -HRESULT WINAPI PathProcessCommandW ( +LONG WINAPI PathProcessCommandW ( LPCWSTR lpszPath, LPWSTR lpszBuff, DWORD dwBuffSize, @@ -723,14 +724,15 @@ HRESULT WINAPI PathProcessCommandW ( { FIXME("(%s, %p, 0x%04lx, 0x%04lx) stub\n", debugstr_w(lpszPath), lpszBuff, dwBuffSize, dwFlags); - strcpyW(lpszBuff, lpszPath); - return 0; + if(!lpszPath) return -1; + if(lpszBuff) strcpyW(lpszBuff, lpszPath); + return strlenW(lpszPath); } /************************************************************************* * PathProcessCommand (SHELL32.653) */ -HRESULT WINAPI PathProcessCommandAW ( +LONG WINAPI PathProcessCommandAW ( LPCVOID lpszPath, LPVOID lpszBuff, DWORD dwBuffSize, diff --git a/include/shlobj.h b/include/shlobj.h index 94f716c..94f0776 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1165,6 +1165,7 @@ BOOL WINAPI WriteCabinetState(CABINETSTA * Path Manipulation Routines */ VOID WINAPI PathGetShortPath(LPWSTR pszPath); +LONG WINAPI PathProcessCommand(LPCWSTR, LPWSTR, int, DWORD); /**************************************************************************** * Drag And Drop Routines

1 0

Jacek Caban : urlmon: Fix BindToStorage test.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 90c70f755ba90e289104bd5db315f6c67a11f4cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90c70f755ba90e289104bd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 12:40:39 2005 +0100 urlmon: Fix BindToStorage test. --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/tests/url.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 6b62c78..d94de61 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -401,7 +401,7 @@ static HRESULT get_callback(IBindCtx *pb hres = IBindCtx_GetObjectParam(pbc, wszBSCBHolder, (IUnknown**)callback); if(FAILED(hres)) - return INET_E_DATA_NOT_AVAILABLE; + return MK_E_SYNTAX; return S_OK; } diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index c8231d9..f73a59d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -694,8 +694,7 @@ static void test_BindToStorage_fail(void ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08lx\n", hres); hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); - ok(hres == INET_E_DATA_NOT_AVAILABLE, - "hres=%08lx, expected INET_E_DATA_NOT_AVAILABLE\n", hres); + ok(hres == MK_E_SYNTAX, "hres=%08lx, expected INET_E_SYNTAX\n", hres); IBindCtx_Release(bctx);

1 0

Jacek Caban : Added some declarations to mshtml.idl.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: a2363a3e5e48481572c0b42d93c1199d6d922185 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2363a3e5e48481572c0b42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 12:40:29 2005 +0100 Added some declarations to mshtml.idl. --- include/mshtmdid.h | 22 ++++ include/mshtml.idl | 279 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 280 insertions(+), 21 deletions(-)

1 0

Jacek Caban : widl: Added bindable and displaybind attributes handling.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: a3b35129ceb0df2e901956941e176e96bfee040b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3b35129ceb0df2e9019569… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 12:40:17 2005 +0100 widl: Added bindable and displaybind attributes handling. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index b8035cd..43ed190 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -210,6 +210,7 @@ static struct keyword { /* ... */ {"dispinterface", tDISPINTERFACE}, /* ... */ + {"displaybind", tDISPLAYBIND}, {"dllname", tDLLNAME}, {"double", tDOUBLE}, {"dual", tDUAL}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ef331a2..4fc19fb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -133,6 +133,7 @@ static type_t std_uhyper = { "MIDL_uhype %token tCONTEXTHANDLESERIALIZE tCONTROL tCPPQUOTE %token tDEFAULT %token tDEFAULTVALUE +%token tDISPLAYBIND %token tDISPINTERFACE %token tDLLNAME tDOUBLE tDUAL %token tENDPOINT @@ -339,6 +340,7 @@ attrib_list: attribute attribute: tASYNC { $$ = make_attr(ATTR_ASYNC); } | tAUTOHANDLE { $$ = make_attr(ATTR_AUTO_HANDLE); } + | tBINDABLE { $$ = make_attr(ATTR_BINDABLE); } | tCALLAS '(' ident ')' { $$ = make_attrp(ATTR_CALLAS, $3); } | tCASE '(' expr_list_const ')' { $$ = make_attrp(ATTR_CASE, $3); } | tCONTEXTHANDLE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); } @@ -348,6 +350,7 @@ attribute: | tDEFAULT { $$ = make_attr(ATTR_DEFAULT); } | tDEFAULTVALUE '(' expr_const ')' { $$ = make_attrp(ATTR_DEFAULTVALUE_EXPR, $3); } | tDEFAULTVALUE '(' aSTRING ')' { $$ = make_attrp(ATTR_DEFAULTVALUE_STRING, $3); } + | tDISPLAYBIND { $$ = make_attr(ATTR_DISPLAYBIND); } | tDLLNAME '(' aSTRING ')' { $$ = make_attrp(ATTR_DLLNAME, $3); } | tDUAL { $$ = make_attr(ATTR_DUAL); } | tENDPOINT '(' aSTRING ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index dea60bb..487b4ad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -58,6 +58,7 @@ enum attr_type { ATTR_ASYNC, ATTR_AUTO_HANDLE, + ATTR_BINDABLE, ATTR_CALLAS, ATTR_CASE, ATTR_CONTEXTHANDLE, @@ -66,6 +67,7 @@ enum attr_type ATTR_DEFAULTVALUE_EXPR, ATTR_DEFAULTVALUE_STRING, ATTR_DISPINTERFACE, + ATTR_DISPLAYBIND, ATTR_DLLNAME, ATTR_DUAL, ATTR_ENDPOINT,

1 0

Milko Krachounov : winecfg: Update Bulgarian resource.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 9e65600971c5855c47da00ba64380a85c3dd9163 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e65600971c5855c47da00b… Author: Milko Krachounov <milko(a)3mhz.net> Date: Fri Dec 16 12:40:05 2005 +0100 winecfg: Update Bulgarian resource. --- programs/winecfg/Bg.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 0d005ee..aae116e 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -159,12 +159,12 @@ BEGIN PUSHBUTTON "��",IDC_AUDIO_AUTODETECT,170,20,69,14 PUSHBUTTON "��",IDC_AUDIO_CONFIGURE,170,40,69,14 PUSHBUTTON "�� ",IDC_AUDIO_CONTROL_PANEL,170,60,69,14 + CONTROL "��",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - - LTEXT "�� : ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�� ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + LTEXT "�� : ",IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "�� ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END

1 0

José Manuel Ferrer Ortiz : uninstaller: Spanish translations update.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 7ec66682f8072b330c0fef48f87206c15c4b24f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ec66682f8072b330c0fef4… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Fri Dec 16 12:39:55 2005 +0100 uninstaller: Spanish translations update. --- programs/uninstaller/Es.rc | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/Es.rc b/programs/uninstaller/Es.rc index 1dc048f..21018ee 100644 --- a/programs/uninstaller/Es.rc +++ b/programs/uninstaller/Es.rc @@ -1,6 +1,7 @@ /* * Uninstaller (Spanish Resources) * + * Copyright 2005 Jos� Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,12 +16,29 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Desinstalador de aplicaciones de Wine" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Por favor, elija la aplicaci�n que desee desinstalar:",IDC_PLEASESELECT,10,10,250,14 + EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL + LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | + LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Desinstalar",IDC_UNINSTALL,270,48,50,14 + PUSHBUTTON "&Acerca de",IDC_ABOUT,270,65,50,14 + PUSHBUTTON "&Salir",IDC_EXIT,270,81,50,14 +END + STRINGTABLE DISCARDABLE { - IDS_APPNAME, "Desinstalador" + IDS_APPNAME, "Desinstalador de aplicaciones de Wine" + IDS_ABOUT, "Desinstalador de aplicaciones de Wine (C) 2005 por Andreas Mohr, Hannu Valtonen y Jonathan Ernst." + IDS_ABOUTTITLE, "Acerca del desinstalador" + IDS_REGISTRYKEYNOTAVAILABLE, "�Clave de desinstalaci�n del registro no disponible (todav�a), nada que hacer!" + IDS_UNINSTALLFAILED, "Ejecuci�n del comando de desinstalaci�n '%s' ha fallado, tal vez se deba a que no exista el ejecutable.\r\n�Desea eliminar la entrada de desinstalaci�n de esta aplicaci�n del registro?" }

1 0

José Manuel Ferrer Ortiz : winecfg: Spanish translations update.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: efa1ae30a4a15bac422af95c0bba02f8135ef29a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efa1ae30a4a15bac422af95… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Fri Dec 16 12:39:46 2005 +0100 winecfg: Spanish translations update. --- programs/winecfg/Es.rc | 195 +++++++++++++++++++++++++------------------ programs/winecfg/winecfg.rc | 2 2 files changed, 113 insertions(+), 84 deletions(-)

1 0

Ragnvald Despair Maartmann-Moe IV : wined3d: Fix matrix copy/paste bug.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 3e495fe4659096a85e2a0f1322a3cabb0d129fab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e495fe4659096a85e2a0f1… Author: Ragnvald "Despair" Maartmann-Moe IV <despair(a)adelphia.net> Date: Fri Dec 16 12:39:07 2005 +0100 wined3d: Fix matrix copy/paste bug. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 4f868ee..21cc284 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -363,7 +363,7 @@ void pshader_m4x3(WINED3DSHADERVECTOR* d void pshader_m3x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX43 mat) { d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; - d->y = mat[2][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; + d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; d->w = mat[3][0] * s0->x + mat[3][1] * s0->y + mat[3][2] * s0->z; PSTRACE(("executing m3x4(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x)); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index a343bcf..ed98c9d 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -315,7 +315,7 @@ void vshader_m4x3(WINED3DSHADERVECTOR* d void vshader_m3x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX43 mat) { d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; - d->y = mat[2][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; + d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; d->w = mat[3][0] * s0->x + mat[3][1] * s0->y + mat[3][2] * s0->z; VSTRACE(("executing m3x4(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x));

1 0

Rein Klazes : user32: Implement saving and fix reading of nonclient metrics.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 13b9923165b7c1430d1acd1adbf05b35093d54d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13b9923165b7c1430d1acd1… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Fri Dec 16 12:38:06 2005 +0100 user32: Implement saving and fix reading of nonclient metrics. With conformance tests. --- dlls/user/sysparams.c | 161 +++++++++++++++------- dlls/user/tests/sysparams.c | 314 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 402 insertions(+), 73 deletions(-)

1 0

Oliver Stieber : wined3d: Vertex declaration recording state.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 74e28a354f40bc1b03003056554883fb0c29b1de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74e28a354f40bc1b0300305… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Fri Dec 16 12:38:24 2005 +0100 wined3d: Vertex declaration recording state. Stop SetVertexDeclaration from reference counting if a stateblock is being recorded. --- dlls/wined3d/device.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ca6031..ba2bb8d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3727,16 +3727,21 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer TRACE("(%p) : pDecl=%p\n", This, pDecl); - /* TODO: what about recording stateblocks? */ + This->updateStateBlock->vertexDecl = pDecl; + This->updateStateBlock->changed.vertexDecl = TRUE; + This->updateStateBlock->set.vertexDecl = TRUE; + + if (This->isRecordingState) { + TRACE("Recording... not performing anything\n"); + return D3D_OK; + } + if (NULL != pDecl) { IWineD3DVertexDeclaration_AddRef(pDecl); } if (NULL != This->updateStateBlock->vertexDecl) { IWineD3DVertexDeclaration_Release(This->updateStateBlock->vertexDecl); } - This->updateStateBlock->vertexDecl = pDecl; - This->updateStateBlock->changed.vertexDecl = TRUE; - This->updateStateBlock->set.vertexDecl = TRUE; return D3D_OK; }

1 0

Tomas Carnecky : x11drv: Allow users to preload an OpenGL library.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 7499cabb28441adb862cbeb3c89fe4832224ac65 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7499cabb28441adb862cbeb… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Fri Dec 16 12:37:34 2005 +0100 x11drv: Allow users to preload an OpenGL library. --- dlls/x11drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index 7660b0e..3a400c1 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -140,7 +140,7 @@ static BOOL has_opengl(void) opengl_handle = wine_dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL, NULL, 0); if (opengl_handle == NULL) return FALSE; -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(opengl_handle, #f, NULL, 0)) == NULL) goto sym_not_found; +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(RTLD_DEFAULT, #f, NULL, 0)) == NULL) goto sym_not_found; LOAD_FUNCPTR(glGetError) LOAD_FUNCPTR(glXChooseVisual) LOAD_FUNCPTR(glXGetConfig)

1 0

Ivan Leo Puoti : Add some structs/prototypes to wdm.h.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 4c53092566327dd9cbf1eab5558e995ab34baadb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c53092566327dd9cbf1eab… Author: Ivan Leo Puoti <ivanleo(a)gmail.com> Date: Fri Dec 16 12:37:24 2005 +0100 Add some structs/prototypes to wdm.h. --- include/ddk/wdm.h | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 49d5977..b10a6f1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -92,6 +92,16 @@ typedef struct _VPB { WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)]; } VPB, *PVPB; +typedef enum _POOL_TYPE { + NonPagedPool, + PagedPool, + NonPagedPoolMustSucceed, + UnkownType, + NonPagedPoolCacheAligned, + PagedPoolCacheAligned, + NonPagedPoolCacheAlignedMustS, + MaxPoolType +} POOL_TYPE; typedef struct _WAIT_CONTEXT_BLOCK { KDEVICE_QUEUE_ENTRY WaitQueueEntry; @@ -826,6 +836,8 @@ typedef struct _KUSER_SHARED_DATA { }; } KSHARED_USER_DATA, *PKSHARED_USER_DATA; +NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); + #define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.CurrentStackLocation) #define KernelMode 0 @@ -842,4 +854,110 @@ typedef struct _KUSER_SHARED_DATA { #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) +/* Zw function prototypes */ +NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); +NTSTATUS WINAPI ZwAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); +NTSTATUS WINAPI ZwAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); +NTSTATUS WINAPI ZwAlertThread(HANDLE ThreadHandle); +NTSTATUS WINAPI ZwAllocateVirtualMemory(HANDLE,PVOID*,ULONG,SIZE_T*,ULONG,ULONG); +NTSTATUS WINAPI ZwCancelIoFile(HANDLE,PIO_STATUS_BLOCK); +NTSTATUS WINAPI ZwCancelTimer(HANDLE, BOOLEAN*); +NTSTATUS WINAPI ZwClearEvent(HANDLE); +NTSTATUS WINAPI ZwClose(HANDLE); +NTSTATUS WINAPI ZwCloseObjectAuditAlarm(PUNICODE_STRING,HANDLE,BOOLEAN); +NTSTATUS WINAPI ZwConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PLPC_SECTION_READ,PULONG,PVOID,PULONG); +NTSTATUS WINAPI ZwCreateDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwCreateEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *,BOOLEAN,BOOLEAN); +NTSTATUS WINAPI ZwCreateFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG); +NTSTATUS WINAPI ZwCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); +NTSTATUS WINAPI ZwCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const LARGE_INTEGER*,ULONG,ULONG,HANDLE); +NTSTATUS WINAPI ZwCreateSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PUNICODE_STRING); +NTSTATUS WINAPI ZwCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, TIMER_TYPE); +NTSTATUS WINAPI ZwDeleteAtom(RTL_ATOM); +NTSTATUS WINAPI ZwDeleteFile(POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwDeleteKey(HANDLE); +NTSTATUS WINAPI ZwDeleteValueKey(HANDLE,const UNICODE_STRING *); +NTSTATUS WINAPI ZwDeviceIoControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); +NTSTATUS WINAPI ZwDisplayString(PUNICODE_STRING); +NTSTATUS WINAPI ZwDuplicateObject(HANDLE,HANDLE,HANDLE,PHANDLE,ACCESS_MASK,ULONG,ULONG); +NTSTATUS WINAPI ZwDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); +NTSTATUS WINAPI ZwEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSTATUS WINAPI ZwEnumerateValueKey(HANDLE,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSTATUS WINAPI ZwFlushInstructionCache(HANDLE,LPCVOID,SIZE_T); +NTSTATUS WINAPI ZwFlushKey(HANDLE); +NTSTATUS WINAPI ZwFlushVirtualMemory(HANDLE,LPCVOID*,SIZE_T*,ULONG); +NTSTATUS WINAPI ZwFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); +NTSTATUS WINAPI ZwFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); +NTSTATUS WINAPI ZwInitiatePowerAction(POWER_ACTION,SYSTEM_POWER_STATE,ULONG,BOOLEAN); +NTSTATUS WINAPI ZwLoadDriver(const UNICODE_STRING *); +NTSTATUS WINAPI ZwLoadKey(const OBJECT_ATTRIBUTES *,OBJECT_ATTRIBUTES *); +NTSTATUS WINAPI ZwLockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); +NTSTATUS WINAPI ZwMakeTemporaryObject(HANDLE); +NTSTATUS WINAPI ZwMapViewOfSection(HANDLE,HANDLE,PVOID*,ULONG,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG); +NTSTATUS WINAPI ZwNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); +NTSTATUS WINAPI ZwOpenDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwOpenEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSTATUS WINAPI ZwOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG); +NTSTATUS WINAPI ZwOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSTATUS WINAPI ZwOpenProcess(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); +NTSTATUS WINAPI ZwOpenProcessToken(HANDLE,DWORD,HANDLE *); +NTSTATUS WINAPI ZwOpenSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSTATUS WINAPI ZwOpenSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwOpenThread(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); +NTSTATUS WINAPI ZwOpenThreadToken(HANDLE,DWORD,BOOLEAN,HANDLE *); +NTSTATUS WINAPI ZwOpenTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*); +NTSTATUS WINAPI ZwPowerInformation(POWER_INFORMATION_LEVEL,PVOID,ULONG,PVOID,ULONG); +NTSTATUS WINAPI ZwPulseEvent(HANDLE,PULONG); +NTSTATUS WINAPI ZwQueryDefaultLocale(BOOLEAN,LCID*); +NTSTATUS WINAPI ZwQueryDefaultUILanguage(LANGID*); +NTSTATUS WINAPI ZwQueryDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); +NTSTATUS WINAPI ZwQueryDirectoryObject(HANDLE,PDIRECTORY_BASIC_INFORMATION,ULONG,BOOLEAN,BOOLEAN,PULONG,PULONG); +NTSTATUS WINAPI ZwQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID,ULONG,PVOID,BOOLEAN); +NTSTATUS WINAPI ZwQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); +NTSTATUS WINAPI ZwQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS); +NTSTATUS WINAPI ZwQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG); +NTSTATUS WINAPI ZwQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); +NTSTATUS WINAPI ZwQueryInstallUILanguage(LANGID*); +NTSTATUS WINAPI ZwQueryKey(HANDLE,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSTATUS WINAPI ZwQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG); +NTSTATUS WINAPI ZwQuerySecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,ULONG,PULONG); +NTSTATUS WINAPI ZwQuerySection(HANDLE,SECTION_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSTATUS WINAPI ZwQuerySymbolicLinkObject(HANDLE,PUNICODE_STRING,PULONG); +NTSTATUS WINAPI ZwQuerySystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSTATUS WINAPI ZwQueryTimerResolution(PULONG,PULONG,PULONG); +NTSTATUS WINAPI ZwQueryValueKey(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSTATUS WINAPI ZwQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); +NTSTATUS WINAPI ZwReadFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,PLARGE_INTEGER,PULONG); +NTSTATUS WINAPI ZwReplaceKey(POBJECT_ATTRIBUTES,HANDLE,POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwRequestWaitReplyPort(HANDLE,PLPC_MESSAGE,PLPC_MESSAGE); +NTSTATUS WINAPI ZwResetEvent(HANDLE,PULONG); +NTSTATUS WINAPI ZwRestoreKey(HANDLE,HANDLE,ULONG); +NTSTATUS WINAPI ZwSaveKey(HANDLE,HANDLE); +NTSTATUS WINAPI ZwSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); +NTSTATUS WINAPI ZwSetDefaultLocale(BOOLEAN,LCID); +NTSTATUS WINAPI ZwSetDefaultUILanguage(LANGID); +NTSTATUS WINAPI ZwSetEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG); +NTSTATUS WINAPI ZwSetEvent(HANDLE,PULONG); +NTSTATUS WINAPI ZwSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); +NTSTATUS WINAPI ZwSetInformationKey(HANDLE,const int,PVOID,ULONG); +NTSTATUS WINAPI ZwSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG); +NTSTATUS WINAPI ZwSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG); +NTSTATUS WINAPI ZwSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); +NTSTATUS WINAPI ZwSetIoCompletion(HANDLE,ULONG,ULONG,NTSTATUS,ULONG); +NTSTATUS WINAPI ZwSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); +NTSTATUS WINAPI ZwSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG); +NTSTATUS WINAPI ZwSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*); +NTSTATUS WINAPI ZwSetTimer(HANDLE, const LARGE_INTEGER*, PTIMER_APC_ROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*); +NTSTATUS WINAPI ZwSetValueKey(HANDLE,const UNICODE_STRING *,ULONG,ULONG,const void *,ULONG); +NTSTATUS WINAPI ZwSetVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); +NTSTATUS WINAPI ZwSuspendThread(HANDLE,PULONG); +NTSTATUS WINAPI ZwTerminateProcess(HANDLE,LONG); +NTSTATUS WINAPI ZwUnloadDriver(const UNICODE_STRING *); +NTSTATUS WINAPI ZwUnloadKey(HANDLE); +NTSTATUS WINAPI ZwUnmapViewOfSection(HANDLE,PVOID); +NTSTATUS WINAPI ZwWaitForSingleObject(HANDLE,BOOLEAN,const LARGE_INTEGER*); +NTSTATUS WINAPI ZwWaitForMultipleObjects(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); +NTSTATUS WINAPI ZwWriteFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,const void*,ULONG,PLARGE_INTEGER,PULONG); +NTSTATUS WINAPI ZwYieldExecution(void); + #endif

1 0

James Hawkins : setupapi: Added stubs for SetupGetInfInformation and
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 11fced7b5759d57c1d6e1becff34409bffce5fe5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11fced7b5759d57c1d6e1be… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 15 11:02:20 2005 +0100 setupapi: Added stubs for SetupGetInfInformation and SetupQueryInfFileInformation. --- dlls/setupapi/setupapi.spec | 6 +++--- dlls/setupapi/stubs.c | 36 ++++++++++++++++++++++++++++++++++++ include/setupapi.h | 6 ++++++ 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8ccbafb..f4fa56f 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -401,7 +401,7 @@ @ stub SetupGetInfFileListA @ stub SetupGetInfFileListW @ stdcall SetupGetInfInformationA(ptr long ptr long ptr) -@ stub SetupGetInfInformationW +@ stdcall SetupGetInfInformationW(ptr long ptr long ptr) @ stub SetupGetInfSections @ stdcall SetupGetIntField(ptr long ptr) @ stdcall SetupGetLineByIndexA(long str long ptr) @@ -457,8 +457,8 @@ @ stub SetupQueryDrivesInDiskSpaceListW @ stub SetupQueryFileLogA @ stub SetupQueryFileLogW -@ stub SetupQueryInfFileInformationA -@ stub SetupQueryInfFileInformationW +@ stdcall SetupQueryInfFileInformationA(ptr long str long ptr) +@ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) @ stub SetupQueryInfOriginalFileInformationA @ stub SetupQueryInfOriginalFileInformationW @ stub SetupQueryInfVersionInformationA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4dcf2fe..59adb78 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -163,6 +163,42 @@ BOOL WINAPI SetupGetInfInformationA( LPC } /*********************************************************************** + * SetupGetInfInformationW (SETUPAPI.@) + */ +BOOL WINAPI SetupGetInfInformationW( LPCVOID InfSpec, DWORD SearchControl, + PSP_INF_INFORMATION ReturnBuffer, + DWORD ReturnBufferSize, PDWORD RequiredSize) +{ + FIXME("(%p, %ld, %p, %ld, %p) Stub!\n", + InfSpec, SearchControl, ReturnBuffer, ReturnBufferSize, RequiredSize ); + return TRUE; +} + +/*********************************************************************** + * SetupQueryInfFileInformationA (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION InfInformation, + UINT InfIndex, PSTR ReturnBuffer, + DWORD ReturnBufferSize, PDWORD RequiredSize) +{ + FIXME("(%p, %u, %p, %ld, %p) Stub!\n", + InfInformation, InfIndex, ReturnBuffer, ReturnBufferSize, RequiredSize ); + return TRUE; +} + +/*********************************************************************** + * SetupQueryInfFileInformationW (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation, + UINT InfIndex, PWSTR ReturnBuffer, + DWORD ReturnBufferSize, PDWORD RequiredSize) +{ + FIXME("(%p, %u, %p, %ld, %p) Stub!\n", + InfInformation, InfIndex, ReturnBuffer, ReturnBufferSize, RequiredSize ); + return TRUE; +} + +/*********************************************************************** * SetupInitializeFileLogW(SETUPAPI.@) */ HANDLE WINAPI SetupInitializeFileLogW(LPWSTR LogFileName, DWORD Flags) diff --git a/include/setupapi.h b/include/setupapi.h index adbdfdf..ce3bde0 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -787,6 +787,9 @@ BOOL WINAPI SetupGetBinaryField( PIN DWORD WINAPI SetupGetFieldCount( PINFCONTEXT context ); BOOL WINAPI SetupGetFileQueueCount( HSPFILEQ, UINT, PUINT ); BOOL WINAPI SetupGetFileQueueFlags( HSPFILEQ, PDWORD ); +BOOL WINAPI SetupGetInfInformationA( LPCVOID, DWORD, PSP_INF_INFORMATION, DWORD, PDWORD); +BOOL WINAPI SetupGetInfInformationW( LPCVOID, DWORD, PSP_INF_INFORMATION, DWORD, PDWORD); +#define SetupGetInfInformation WINELIB_NAME_AW(SetupGetInfInformation) BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result ); BOOL WINAPI SetupGetLineByIndexA( HINF, PCSTR, DWORD, INFCONTEXT * ); BOOL WINAPI SetupGetLineByIndexW( HINF, PCWSTR, DWORD, INFCONTEXT * ); @@ -824,6 +827,9 @@ HINF WINAPI SetupOpenInfFileA( PCSTR HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR pszclass, DWORD style, UINT *error ); #define SetupOpenInfFile WINELIB_NAME_AW(SetupOpenInfFile) HINF WINAPI SetupOpenMasterInf( VOID ); +BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION, UINT, PSTR, DWORD, PDWORD); +BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION, UINT, PWSTR, DWORD, PDWORD); +#define SetupQueryInfFileInformation WINELIB_NAME_AW(SetupQueryInFileInformation) BOOL WINAPI SetupQueueCopyA(HSPFILEQ,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD); BOOL WINAPI SetupQueueCopyW(HSPFILEQ,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,DWORD); #define SetupQueueCopy WINELIB_NAME_AW(SetupQueueCopy)

1 0

Alexandre Julliard : ntdll: Reimplemented _chkstk and _alloca_probe directly in assembly.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 50bbfb3c8c6f69be82291f1d8cf9916343e24a61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50bbfb3c8c6f69be82291f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 10:48:12 2005 +0100 ntdll: Reimplemented _chkstk and _alloca_probe directly in assembly. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 04ae9f4..64e7daf 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1233,7 +1233,7 @@ @ stdcall -ret64 _alldiv(double double) # @ stub _alldvrm @ stdcall -ret64 _allmul(double double) -@ stdcall -i386 _alloca_probe() +@ stdcall -i386 -norelay _alloca_probe() @ stdcall -ret64 _allrem(double double) # @ stub _allshl # @ stub _allshr @@ -1242,7 +1242,7 @@ # @ stub _aulldvrm @ stdcall -ret64 _aullrem(double double) # @ stub _aullshr -@ stdcall -i386 _chkstk() +@ stdcall -i386 -norelay _chkstk() @ stub _fltused @ cdecl -ret64 _ftol() NTDLL__ftol @ cdecl _i64toa(double ptr long) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index f01dbe4..0881c97 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -391,11 +391,13 @@ DWORD WINAPI RtlDeleteSecurityObject(DWO * Glorified "enter xxxx". */ #ifdef __i386__ -void WINAPI __regs__chkstk( CONTEXT86 *context ) -{ - context->Esp -= context->Eax; -} -DEFINE_REGS_ENTRYPOINT( _chkstk, 0, 0 ); +__ASM_GLOBAL_FUNC( _chkstk, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ); #endif /************************************************************************** @@ -404,11 +406,13 @@ DEFINE_REGS_ENTRYPOINT( _chkstk, 0, 0 ); * Glorified "enter xxxx". */ #ifdef __i386__ -void WINAPI __regs__alloca_probe( CONTEXT86 *context ) -{ - context->Esp -= context->Eax; -} -DEFINE_REGS_ENTRYPOINT( _alloca_probe, 0, 0 ); +__ASM_GLOBAL_FUNC( _alloca_probe, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ); #endif

1 0

Jacek Caban : mshtml: Fix handling Gecko strings.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: b48d9590a3fdd6e9f913e0d703045802a5232211 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b48d9590a3fdd6e9f913e0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 10:41:56 2005 +0100 mshtml: Fix handling Gecko strings. --- dlls/mshtml/nsembed.c | 19 ++++++++++--------- dlls/mshtml/nsiface.idl | 8 +++++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index bce48ed..f409eae 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -44,22 +44,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define PR_UINT32_MAX 0xffffffff -typedef struct nsACString { +struct nsStringContainer { + void *v; void *d1; PRUint32 d2; void *d3; -} nsString; +}; static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*); static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*); static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**); -static nsresult (*NS_StringContainerInit)(nsString*); -static nsresult (*NS_CStringContainerInit)(nsACString*); -static nsresult (*NS_StringContainerFinish)(nsString*); -static nsresult (*NS_CStringContainerFinish)(nsACString*); -static nsresult (*NS_StringSetData)(nsString*,const PRUnichar*,PRUint32); +static nsresult (*NS_StringContainerInit)(nsStringContainer*); +static nsresult (*NS_CStringContainerInit)(nsCStringContainer*); +static nsresult (*NS_StringContainerFinish)(nsStringContainer*); +static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*); +static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32); static nsresult (*NS_CStringSetData)(nsACString*,const char*,PRUint32); -static nsresult (*NS_NewLocalFile)(const nsString*,PRBool,nsIFile**); +static nsresult (*NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**); static PRUint32 (*NS_CStringGetData)(nsACString*,const char**,PRBool*); static HINSTANCE hXPCOM = NULL; @@ -245,7 +246,7 @@ static BOOL load_gecko() nsresult nsres; nsIObserver *pStartNotif; nsIComponentRegistrar *registrar = NULL; - nsString path; + nsAString path; nsIFile *gre_dir; PRUnichar gre_path[MAX_PATH]; WCHAR path_env[MAX_PATH]; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 077ed25..0567c6a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -44,11 +44,13 @@ typedef BYTE PRUint8; typedef BOOL PRBool; typedef LARGE_INTEGER PRInt64; typedef ULARGE_INTEGER PRUint64; - -typedef int nsAString; -typedef struct nsACString nsACString; typedef PRUint64 DOMTimeStamp; +typedef struct nsStringContainer nsStringContainer; +typedef nsStringContainer nsCStringContainer; +typedef nsStringContainer nsACString; +typedef nsStringContainer nsAString; + interface nsIWebBrowserChrome; [

1 0

Jacek Caban : mshtml: Set Gecko's profile.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 054164d5ba844bfa5470bd650b90c12035699c35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=054164d5ba844bfa5470bd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 10:26:11 2005 +0100 mshtml: Set Gecko's profile. Make sure that Gecko components are registered. --- dlls/mshtml/nsembed.c | 52 ++++++++++++++++++++++++++++++++++++++++++----- dlls/mshtml/nsiface.idl | 20 ++++++++++++++++++ 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index bd36126..bce48ed 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" #define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" #define NS_IOSERVICE_CONTRACTID "@mozilla.org/network/io-service;1" +#define NS_PROFILE_CONTRACTID "@mozilla.org/profile/manager;1" #define APPSTARTUP_TOPIC "app-startup" @@ -210,11 +211,40 @@ static BOOL get_wine_gecko_path(PRUnicha return TRUE; } +static void set_profile(void) +{ + nsIProfile *profile; + PRBool exists = FALSE; + nsresult nsres; + + static const WCHAR wszMSHTML[] = {'M','S','H','T','M','L',0}; + + nsres = nsIServiceManager_GetServiceByContactID(pServMgr, NS_PROFILE_CONTRACTID, + &IID_nsIProfile, (void**)&profile); + if(NS_FAILED(nsres)) { + ERR("Could not get profile service: %08lx\n", nsres); + return; + } + + nsres = nsIProfile_ProfileExists(profile, wszMSHTML, &exists); + if(!exists) { + nsres = nsIProfile_CreateNewProfile(profile, wszMSHTML, NULL, NULL, FALSE); + if(NS_FAILED(nsres)) + ERR("CreateNewProfile failed: %08lx\n", nsres); + } + + nsres = nsIProfile_SetCurrentProfile(profile, wszMSHTML); + if(NS_FAILED(nsres)) + ERR("SetCurrentProfile failed: %08lx\n", nsres); + + nsIProfile_Release(profile); +} + static BOOL load_gecko() { nsresult nsres; nsIObserver *pStartNotif; - nsIComponentRegistrar *registrar; + nsIComponentRegistrar *registrar = NULL; nsString path; nsIFile *gre_dir; PRUnichar gre_path[MAX_PATH]; @@ -292,6 +322,19 @@ static BOOL load_gecko() if(NS_FAILED(nsres)) ERR("Could not get nsIComponentManager: %08lx\n", nsres); + nsres = NS_GetComponentRegistrar(&registrar); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIComponentRegistrar_AutoRegister(registrar, NULL); + if(NS_FAILED(nsres)) + ERR("AutoRegister(NULL) failed: %08lx\n", nsres); + + nsres = nsIComponentRegistrar_AutoRegister(registrar, gre_dir); + if(NS_FAILED(nsres)) + ERR("AutoRegister(gre_dir) failed: %08lx\n", nsres); + }else { + ERR("NS_GetComponentRegistrar failed: %08lx\n", nsres); + } + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_APPSTARTUPNOTIFIER_CONTRACTID, NULL, &IID_nsIObserver, (void**)&pStartNotif); if(NS_SUCCEEDED(nsres)) { @@ -304,14 +347,13 @@ static BOOL load_gecko() ERR("could not get appstartup-notifier: %08lx\n", nsres); } - nsres = NS_GetComponentRegistrar(&registrar); - if(NS_SUCCEEDED(nsres)) { + if(registrar) { register_nsservice(registrar); nsIComponentRegistrar_Release(registrar); - }else { - ERR("NS_GetComponentRegistrar failed: %08lx\n", nsres); } + set_profile(); + return TRUE; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 390e115..077ed25 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -515,3 +515,23 @@ interface nsIPromptService : nsISupports const PRUnichar *aText, PRUint32 aCount, const PRUnichar **aSelectList, PRInt32 *aOutSelection, PRBool *_retval); } + +[ + object, + uuid(02b0625a-e7f3-11d2-9f5a-006008a6efe9) +] +interface nsIProfile : nsISupports +{ + nsresult GetProfileCount(PRInt32 *aProfileCount); + nsresult GetProfileList(PRUint32 *length, PRUnichar ***profileNames); + nsresult ProfileExists(const PRUnichar *profileName, PRBool *_retval); + nsresult GetCurrentProfile(PRUnichar * *aCurrentProfile); + nsresult SetCurrentProfile(const PRUnichar * aCurrentProfile); + nsresult ShutDownCurrentProfile(PRUint32 shutDownType); + nsresult CreateNewProfile(const PRUnichar *profileName, + const PRUnichar *nativeProfileDir, const PRUnichar *langcode, + PRBool useExistingDir); + nsresult RenameProfile(const PRUnichar *oldName, const PRUnichar *newName); + nsresult DeleteProfile(const PRUnichar *name, PRBool canDeleteFiles); + nsresult CloneProfile(const PRUnichar *profileName); +}

1 0

Oliver Stieber : wined3d: Internal reference counting.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: e76969b0d61dd2c1a23a2ab7e7f42bbd9d327df4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e76969b0d61dd2c1a23a2ab… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Thu Dec 15 10:25:47 2005 +0100 wined3d: Internal reference counting. Change most references to resources parent into references to the resource, so that external reference counts match DirectX but object aren't released if they are still referenced by the stateblock. --- dlls/wined3d/device.c | 90 ++++++++++++++++++--------------------------- dlls/wined3d/stateblock.c | 29 ++++++--------- 2 files changed, 48 insertions(+), 71 deletions(-)

1 0

Paul Vriens : mscms: Add another possible error.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 49f137b666db766178ca87dc00095a00bd3be573 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49f137b666db766178ca87d… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Dec 15 10:25:19 2005 +0100 mscms: Add another possible error. --- dlls/mscms/tests/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 223dbc1..45b569c 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -515,7 +515,7 @@ static void test_GetStandardColorSpacePr /* Parameter checks */ todo_wine - fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER)); + fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); todo_wine fail_GSCSPW(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER)); todo_wine

1 0

Paul Vriens : d3d9: Don't treat missing d3d9.dll as a failure.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 27462d1d40306b9ba10d9e353890cd101d16adfa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27462d1d40306b9ba10d9e3… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Dec 15 10:25:06 2005 +0100 d3d9: Don't treat missing d3d9.dll as a failure. --- dlls/d3d9/tests/vertexdeclaration.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index eb88240..5118b55 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -20,19 +20,16 @@ #include <d3d9.h> #include "wine/test.h" +static HMODULE d3d9_handle = 0; + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; - HMODULE d3d9_handle = 0; IDirect3D9 *d3d9_ptr = 0; IDirect3DDevice9 *device_ptr = 0; D3DPRESENT_PARAMETERS present_parameters; HRESULT hres; - d3d9_handle = LoadLibrary("d3d9"); - ok(d3d9_handle != NULL, "Failed to load d3d9.\n"); - if (!d3d9_handle) return NULL; - d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); if (!d3d9_create) return NULL; @@ -93,7 +90,16 @@ static void test_get_set_vertex_declarat START_TEST(vertexdeclaration) { - IDirect3DDevice9 *device_ptr = init_d3d9(); + IDirect3DDevice9 *device_ptr; + + d3d9_handle = LoadLibraryA("d3d9.dll"); + if (!d3d9_handle) + { + trace("Could not load d3d9.dll, skipping tests\n"); + return; + } + + device_ptr = init_d3d9(); if (!device_ptr) return; test_get_set_vertex_declaration(device_ptr);

1 0

Dmitry Timoshkov : iccvid: Add support for ICM_DECOMPRESS_END message.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: bd52a2eedffe50c7b4e84d8eeb1d391d1c070942 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd52a2eedffe50c7b4e84d8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 15 10:24:49 2005 +0100 iccvid: Add support for ICM_DECOMPRESS_END message. --- dlls/iccvid/iccvid.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 009c4ae..06915d1 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -931,6 +931,16 @@ static LRESULT ICCVID_GetInfo( ICCVID_In return sizeof(ICINFO); } +static LRESULT ICCVID_DecompressEnd( ICCVID_Info *info ) +{ + if( info->cvinfo ) + { + free_cvinfo( info->cvinfo ); + info->cvinfo = NULL; + } + return ICERR_OK; +} + LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, LPARAM lParam1, LPARAM lParam2) { @@ -978,6 +988,10 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ case ICM_DECOMPRESSEX: return ICCVID_DecompressEx( info, (ICDECOMPRESSEX*) lParam1, (DWORD) lParam2 ); + + case ICM_DECOMPRESS_END: + return ICCVID_DecompressEnd( info ); + case DRV_CLOSE: return ICCVID_Close( info );

1 0

bugzilla/template/en/default/global banner.htm ...
by Jeremy Newman Dec. 14, 2005

Dec. 14, 2005

ChangeSet ID: 21851 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2005/12/14 09:40:13 Modified files: template/en/default/global: banner.html.tmpl Log message: take out the banner ad rotation for bugzilla Patch: http://cvs.winehq.org/patch.py?id=21851 Old revision New revision Changes Path 1.2 1.3 +5 -3 bugzilla/template/en/default/global/banner.html.tmpl Index: bugzilla/template/en/default/global/banner.html.tmpl diff -u -p bugzilla/template/en/default/global/banner.html.tmpl:1.2 bugzilla/template/en/default/global/banner.html.tmpl:1.3 --- bugzilla/template/en/default/global/banner.html.tmpl:1.2 14 Dec 2005 15:40:13 -0000 +++ bugzilla/template/en/default/global/banner.html.tmpl 14 Dec 2005 15:40:13 -0000 @@ -29,15 +29,17 @@ <tr> <td width="100%"><a href="http://bugs.winehq.org/"><img src="images/winehq_top_logo.gif" width=209 height=99 border=0 alt="Wine HQ Bugzilla"></a></td> <td> - <img src="images/blank.gif" border=0 width=10 height=1 alt=""> + <img src="images/blank.gif" border="0" width="10" height="1" alt=""> </td> <td width="468" align="center" valign="middle">  - <iframe src="http://www.winehq.org/bin/ad" scrolling="no" frameBorder="0" height="60" width="468"></iframe> + <a href="http://www.codeweavers.com/products/support_wine/?ad=5" target="_top"><img + src="http://www.winehq.org/images/bannerads/cw-ad02.gif" width="468" height="60" border="0" + alt="Support the Wine Project!" /></a>  </td> <td> - <img src="images/blank.gif" border=0 width=10 height=1 alt=""> + <img src="images/blank.gif" border="0" width="10" height="1" alt=""> </td> </tr> </table>

1 0

lostwages/images/bannerads cw-ad02.gif
by Jeremy Newman Dec. 14, 2005

Dec. 14, 2005

ChangeSet ID: 21850 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/14 09:35:44 Modified files: images/bannerads: cw-ad02.gif Log message: update ad Patch: http://cvs.winehq.org/patch.py?id=21850 Old revision New revision Changes Path 1.3 1.4 +47 -8 lostwages/images/bannerads/cw-ad02.gif

1 0

lostwages/bin ad
by Jeremy Newman Dec. 14, 2005

Dec. 14, 2005

ChangeSet ID: 21849 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/14 09:23:33 Modified files: bin : ad Log message: cookie expires to soon, set for 1 year Patch: http://cvs.winehq.org/patch.py?id=21849 Old revision New revision Changes Path 1.1 1.2 +1 -1 lostwages/bin/ad Index: lostwages/bin/ad diff -u -p lostwages/bin/ad:1.1 lostwages/bin/ad:1.2 --- lostwages/bin/ad:1.1 14 Dec 2005 15:23:33 -0000 +++ lostwages/bin/ad 14 Dec 2005 15:23:33 -0000 @@ -69,7 +69,7 @@ else list($url, $alt) = get_xml_tags($bannerads_path.$img.'.xml', array('url', 'alt')); // da banner -setcookie("whqac", $whqac, time()+60*60*24*1); +setcookie("whqac", $whqac, time()+60*60*24*365); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header("Cache-Control: no-store, no-cache, must-revalidate");

1 0

Rein Klazes : user: Read/save minimized metrics from/to registry.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 105450db4a1d8794788f41813dcc85bfe7a1e828 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=105450db4a1d8794788f418… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Wed Dec 14 12:27:39 2005 +0100 user: Read/save minimized metrics from/to registry. --- dlls/user/sysparams.c | 129 ++++++++++++++++++++++++++++++------------- dlls/user/tests/sysparams.c | 104 ++++++++++++++++++++++++++++++----- 2 files changed, 180 insertions(+), 53 deletions(-)

1 0

Alexandre Julliard : preloader: Reserve some space for the shared user data.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 0577113e35abcfd9ad0172d9bf4ea2aae8ec64c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0577113e35abcfd9ad0172d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 12:19:18 2005 +0100 preloader: Reserve some space for the shared user data. --- loader/preloader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index f4343a7..040fb66 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -109,7 +109,7 @@ static struct wine_preload_info preload_info[] = { { (void *)0x00000000, 0x00110000 }, /* DOS area */ - { (void *)0x80000000, 0x01000000 }, /* shared heap */ + { (void *)0x7ffe0000, 0x01020000 }, /* shared user data + shared heap */ { (void *)0x00110000, 0x1fef0000 }, /* PE exe range (may be set with WINEPRELOADRESERVE), defaults to 512mb */ { 0, 0 } /* end of list */ };

1 0

Alexandre Julliard : ntdll: Fixes in virtual memory protection flags.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 354e7700b300421779d489847c7b900cc30ca0bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=354e7700b300421779d4898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 12:17:59 2005 +0100 ntdll: Fixes in virtual memory protection flags. Tweak reporting of virtual protection flags and address space limit to yield results closer to what Windows does. --- dlls/ntdll/virtual.c | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7d2d445..3cd9fff 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -118,7 +118,7 @@ static RTL_CRITICAL_SECTION csVirtual = # define page_size 0x1000 /* Note: these are Windows limits, you cannot change them. */ # define ADDRESS_SPACE_LIMIT ((void *)0xc0000000) /* top of the total available address space */ -# define USER_SPACE_LIMIT ((void *)0x80000000) /* top of the user address space */ +# define USER_SPACE_LIMIT ((void *)0x7fff0000) /* top of the user address space */ #else static UINT page_shift; static UINT page_size; @@ -379,7 +379,7 @@ static NTSTATUS create_view( struct file view->flags = 0; view->mapping = 0; view->protect = vprot; - memset( view->prot, vprot, size >> page_shift ); + memset( view->prot, vprot & ~VPROT_IMAGE, size >> page_shift ); /* Insert it in the linked list */ @@ -448,22 +448,13 @@ static int VIRTUAL_GetUnixProt( BYTE vpr * VIRTUAL_GetWin32Prot * * Convert page protections to Win32 flags. - * - * RETURNS - * None */ -static void VIRTUAL_GetWin32Prot( - BYTE vprot, /* [in] Page protection flags */ - DWORD *protect, /* [out] Location to store Win32 protection flags */ - DWORD *state ) /* [out] Location to store mem state flag */ +static DWORD VIRTUAL_GetWin32Prot( BYTE vprot ) { - if (protect) { - *protect = VIRTUAL_Win32Flags[vprot & 0x0f]; - if (vprot & VPROT_NOCACHE) *protect |= PAGE_NOCACHE; - if (vprot & VPROT_GUARD) *protect = PAGE_NOACCESS | PAGE_GUARD; - } - - if (state) *state = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; + DWORD ret = VIRTUAL_Win32Flags[vprot & 0x0f]; + if (vprot & VPROT_NOCACHE) ret |= PAGE_NOCACHE; + if (vprot & VPROT_GUARD) ret |= PAGE_GUARD; + return ret; } @@ -1461,7 +1452,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( /* Make sure all the pages are committed */ p = view->prot + ((base - (char *)view->base) >> page_shift); - VIRTUAL_GetWin32Prot( *p, &prot, NULL ); + prot = VIRTUAL_GetWin32Prot( *p ); for (i = size >> page_shift; i; i--, p++) { if (!(*p & VPROT_COMMITTED)) @@ -1583,13 +1574,14 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HA else { BYTE vprot = view->prot[(base - alloc_base) >> page_shift]; - VIRTUAL_GetWin32Prot( vprot, &info->Protect, &info->State ); - for (size = base - alloc_base; size < view->size; size += page_mask+1) - if (view->prot[size >> page_shift] != vprot) break; - VIRTUAL_GetWin32Prot( view->protect, &info->AllocationProtect, NULL ); + info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; + info->Protect = VIRTUAL_GetWin32Prot( vprot ); + info->AllocationProtect = VIRTUAL_GetWin32Prot( view->protect ); if (view->protect & VPROT_IMAGE) info->Type = MEM_IMAGE; else if (view->flags & VFLAG_VALLOC) info->Type = MEM_PRIVATE; else info->Type = MEM_MAPPED; + for (size = base - alloc_base; size < view->size; size += page_mask+1) + if (view->prot[size >> page_shift] != vprot) break; } RtlLeaveCriticalSection(&csVirtual);

1 0

H. Verbeet : d3d9: Add a test for Get/SetVertexDeclaration refcounts.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: fa40b77ad71419f578e9fecb03544c8457f107a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa40b77ad71419f578e9fec… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 14 11:29:38 2005 +0100 d3d9: Add a test for Get/SetVertexDeclaration refcounts. --- dlls/d3d9/tests/.gitignore | 1 dlls/d3d9/tests/Makefile.in | 3 + dlls/d3d9/tests/vertexdeclaration.c | 100 +++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 1 deletions(-) create mode 100644 dlls/d3d9/tests/vertexdeclaration.c diff --git a/dlls/d3d9/tests/.gitignore b/dlls/d3d9/tests/.gitignore index bb354df..09b33b6 100644 --- a/dlls/d3d9/tests/.gitignore +++ b/dlls/d3d9/tests/.gitignore @@ -2,3 +2,4 @@ Makefile shader.ok stateblock.ok testlist.c +vertexdeclaration.ok diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in index ab026e0..d27d091 100644 --- a/dlls/d3d9/tests/Makefile.in +++ b/dlls/d3d9/tests/Makefile.in @@ -7,7 +7,8 @@ IMPORTS = user32 kernel32 CTESTS = \ shader.c \ - stateblock.c + stateblock.c \ + vertexdeclaration.c @MAKE_TEST_RULES@ diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c new file mode 100644 index 0000000..eb88240 --- /dev/null +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2005 Henri Verbeet + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define COBJMACROS +#include <d3d9.h> +#include "wine/test.h" + +static IDirect3DDevice9 *init_d3d9(void) +{ + IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; + HMODULE d3d9_handle = 0; + IDirect3D9 *d3d9_ptr = 0; + IDirect3DDevice9 *device_ptr = 0; + D3DPRESENT_PARAMETERS present_parameters; + HRESULT hres; + + d3d9_handle = LoadLibrary("d3d9"); + ok(d3d9_handle != NULL, "Failed to load d3d9.\n"); + if (!d3d9_handle) return NULL; + + d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); + ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); + if (!d3d9_create) return NULL; + + d3d9_ptr = d3d9_create(D3D_SDK_VERSION); + ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); + if (!d3d9_ptr) return NULL; + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = GetDesktopWindow(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + ok(hres == D3D_OK, "IDirect3D_CreateDevice returned: 0x%lx\n", hres); + + return device_ptr; +} + +static int get_refcount(IUnknown *object) +{ + IUnknown_AddRef(object); + return IUnknown_Release(object); +} + +static void test_get_set_vertex_declaration(IDirect3DDevice9 *device_ptr) +{ + static D3DVERTEXELEMENT9 simple_decl[] = { + { 0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, + D3DDECL_END()}; + + IDirect3DVertexDeclaration9 *decl_ptr = 0; + IDirect3DVertexDeclaration9 *current_decl_ptr = 0; + HRESULT hret = 0; + int decl_refcount = 0; + int i = 0; + + hret = IDirect3DDevice9_CreateVertexDeclaration(device_ptr, simple_decl, &decl_ptr); + ok(hret == D3D_OK && decl_ptr != NULL, "CreateVertexDeclaration returned: hret 0x%lx, decl_ptr %p. " + "Expected hret 0x%lx, decl_ptr != %p. Aborting.\n", hret, decl_ptr, D3D_OK, NULL); + if (hret != D3D_OK || decl_ptr == NULL) return; + + /* SetVertexDeclaration should not touch the declaration's refcount. */ + i = get_refcount((IUnknown *)decl_ptr); + hret = IDirect3DDevice9_SetVertexDeclaration(device_ptr, decl_ptr); + decl_refcount = get_refcount((IUnknown *)decl_ptr); + ok(hret == D3D_OK && decl_refcount == i, "SetVertexDeclaration returned: hret 0x%lx, refcount %d. " + "Expected hret 0x%lx, refcount %d.\n", hret, decl_refcount, D3D_OK, i); + + /* GetVertexDeclaration should increase the declaration's refcount by one. */ + i = decl_refcount+1; + hret = IDirect3DDevice9_GetVertexDeclaration(device_ptr, &current_decl_ptr); + decl_refcount = get_refcount((IUnknown *)decl_ptr); + ok(hret == D3D_OK && decl_refcount == i && current_decl_ptr == decl_ptr, + "GetVertexDeclaration returned: hret 0x%lx, current_decl_ptr %p refcount %d. " + "Expected hret 0x%lx, current_decl_ptr %p, refcount %d.\n", hret, current_decl_ptr, decl_refcount, D3D_OK, decl_ptr, i); +} + +START_TEST(vertexdeclaration) +{ + IDirect3DDevice9 *device_ptr = init_d3d9(); + if (!device_ptr) return; + + test_get_set_vertex_declaration(device_ptr); +}

1 0

H. Verbeet : d3d9: Check for a NULL shader in IDirect3DDevice9Impl_GetVertexShader
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 0a0e948b2809590e2475e2d64e58a6adab3c7536 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a0e948b2809590e2475e2d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 14 11:29:05 2005 +0100 d3d9: Check for a NULL shader in IDirect3DDevice9Impl_GetVertexShader before getting the parent. --- dlls/d3d9/vertexshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index e4f76b9..034b097 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -148,7 +148,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetV TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice); hrc = IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &pShader); - if(hrc == D3D_OK){ + if(hrc == D3D_OK && pShader != NULL){ hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader); IWineD3DVertexShader_Release(pShader); } else {

1 0

H. Verbeet : wined3d: Return the correct parent in IWineD3DVertexDeclarationImpl_GetParent.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 0f43cb2f3836cdda535a383cd743f6a30593463c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f43cb2f3836cdda535a383… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 14 11:29:17 2005 +0100 wined3d: Return the correct parent in IWineD3DVertexDeclarationImpl_GetParent. --- dlls/wined3d/vertexdeclaration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 56f56b6..74dce97 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -432,7 +432,7 @@ ULONG WINAPI IWineD3DVertexDeclarationIm HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetParent(IWineD3DVertexDeclaration *iface, IUnknown** parent){ IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; - *parent= (IUnknown*) parent; + *parent= This->parent; IUnknown_AddRef(*parent); TRACE("(%p) : returning %p\n", This, *parent); return D3D_OK;

1 0

Vitaliy Margolen : ntdll: Implement FSCTL_PIPE_WAIT NtFsControlFile ioctl.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: b05340a52397e2474668920edee18eb8c8f34fb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b05340a52397e2474668920… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Dec 14 11:14:02 2005 +0100 ntdll: Implement FSCTL_PIPE_WAIT NtFsControlFile ioctl. Implement FSCTL_PIPE_WAIT NtFsControlFile ioctl. Modify WaitNamedPipeW to use NtFsControlFile. Replace struct overlapped with event. --- dlls/kernel/sync.c | 95 +++++++++++++++++++++------------------- dlls/kernel/tests/pipe.c | 2 - dlls/ntdll/file.c | 44 +++++++++++++------ include/wine/server_protocol.h | 5 +- include/winioctl.h | 7 +++ server/named_pipe.c | 18 ++++---- server/protocol.def | 3 + server/trace.c | 3 + 8 files changed, 108 insertions(+), 69 deletions(-)

1 0

Mike McCormack : winecfg: Update Korean translation.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 12b35c2dd809903d76d1738d1b95f2945db3231a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12b35c2dd809903d76d1738… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Dec 14 10:51:10 2005 +0100 winecfg: Update Korean translation. --- programs/winecfg/Ko.rc | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index bc9c355..56e0422 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -156,16 +156,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "�� ̹�: ",IDC_STATIC,10,20,60,8 COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "�ڵ��˻�",IDC_AUDIO_AUTODETECT,170,20,49,14 - PUSHBUTTON "��",IDC_AUDIO_CONFIGURE,170,40,49,14 - PUSHBUTTON "��",IDC_AUDIO_CONTROL_PANEL,170,60,49,14 - - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - - LTEXT "�ϵ�� : ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "��̹� �ֹ�",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 - + PUSHBUTTON "�ڵ��˻�",IDC_AUDIO_AUTODETECT,170,20,59,14 + PUSHBUTTON "��",IDC_AUDIO_CONFIGURE,170,40,59,14 + PUSHBUTTON "��",IDC_AUDIO_CONTROL_PANEL,170,60,59,14 + CONTROL "��ġ",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX "DirectSound ",IDC_STATIC,8,205,244,120 + LTEXT "�ϵ�� : ",IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "��̹� �ֹ�",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250

1 0

H. Verbeet : wined3d: Return the correct vertex declaration.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: dabcbe83e79eae3950385adffbc1108b1d19b57d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dabcbe83e79eae3950385ad… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 14 10:50:27 2005 +0100 wined3d: Return the correct vertex declaration. In IWineD3DDeviceImpl_GetVertexDeclaration, return the vertex declaration in This->stateblock instead of the one in This->updateStateBlock. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a9c253f..bb9247b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3754,7 +3754,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer TRACE("(%p) : ppDecl=%p\n", This, ppDecl); - *ppDecl = This->updateStateBlock->vertexDecl; + *ppDecl = This->stateBlock->vertexDecl; if (NULL != *ppDecl) IWineD3DVertexDeclaration_AddRef(*ppDecl); return D3D_OK; }

1 0

Paul Vriens : d3d9: Don't treat missing d3d9.dll as a failure.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 9a1bc10f5d7d8417110a354e2feadf5ef9da1023 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a1bc10f5d7d8417110a354… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Dec 14 10:50:52 2005 +0100 d3d9: Don't treat missing d3d9.dll as a failure. --- dlls/d3d9/tests/shader.c | 18 ++++++++++++------ dlls/d3d9/tests/stateblock.c | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 8622e6e..6da5164 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -20,19 +20,16 @@ #include <d3d9.h> #include "wine/test.h" +static HMODULE d3d9_handle = 0; + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; - HMODULE d3d9_handle = 0; IDirect3D9 *d3d9_ptr = 0; IDirect3DDevice9 *device_ptr = 0; D3DPRESENT_PARAMETERS present_parameters; HRESULT hres; - d3d9_handle = LoadLibrary("d3d9"); - ok(d3d9_handle != NULL, "Failed to load d3d9.\n"); - if (!d3d9_handle) return NULL; - d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); if (!d3d9_create) return NULL; @@ -136,7 +133,16 @@ static void test_get_set_pixel_shader(ID START_TEST(shader) { D3DCAPS9 caps; - IDirect3DDevice9 *device_ptr = init_d3d9(); + IDirect3DDevice9 *device_ptr; + + d3d9_handle = LoadLibraryA("d3d9.dll"); + if (!d3d9_handle) + { + trace("Could not load d3d9.dll, skipping tests\n"); + return; + } + + device_ptr = init_d3d9(); if (!device_ptr) return; IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index dcb49b8..61b5be5 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -19,19 +19,16 @@ #include <d3d9.h> #include "wine/test.h" +static HMODULE d3d9_handle = 0; + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; - HMODULE d3d9_handle = 0; IDirect3D9 *d3d9_ptr = 0; IDirect3DDevice9 *device_ptr = 0; D3DPRESENT_PARAMETERS present_parameters; HRESULT hres; - d3d9_handle = LoadLibrary("d3d9"); - ok(d3d9_handle != NULL, "Failed to load d3d9.\n"); - if (!d3d9_handle) return NULL; - d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); if (!d3d9_create) return NULL; @@ -83,6 +80,15 @@ static void test_begin_end_state_block(I START_TEST(stateblock) { - IDirect3DDevice9 *device_ptr = init_d3d9(); + IDirect3DDevice9 *device_ptr; + + d3d9_handle = LoadLibraryA("d3d9.dll"); + if (!d3d9_handle) + { + trace("Could not load d3d9.dll, skipping tests\n"); + return; + } + + device_ptr = init_d3d9(); test_begin_end_state_block(device_ptr); }

1 0

Ulrich Czekalla : riched20: Reset selection when text is reset.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 0f55ef3befa563fd578f7c16dbc65602defd0e1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f55ef3befa563fd578f7c1… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Wed Dec 14 10:50:04 2005 +0100 riched20: Reset selection when text is reset. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1383bcf..7723865 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1471,6 +1471,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND TRACE("WM_SETTEXT - NULL\n"); ME_CommitUndo(editor); ME_EmptyUndoStack(editor); + ME_SetSelection(editor, 0, 0); ME_UpdateRepaint(editor); return 0; }

1 0

Aric Stewart : user: GetClipboardFormatNameA fix.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: c50fbab47f99a5787e29892fce6686c5eb92939c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c50fbab47f99a5787e29892… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 10:49:54 2005 +0100 user: GetClipboardFormatNameA fix. In the W->A translation make sure we have characters to translate before doing the WideCharToMultiByte with -1. --- dlls/user/clipboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/clipboard.c b/dlls/user/clipboard.c index 5a51f01..2e54f76 100644 --- a/dlls/user/clipboard.c +++ b/dlls/user/clipboard.c @@ -271,7 +271,7 @@ INT WINAPI GetClipboardFormatNameA(UINT ret = GetClipboardFormatNameW( wFormat, p, maxlen ); - if (maxlen > 0 && !WideCharToMultiByte( CP_ACP, 0, p, -1, retStr, maxlen, 0, 0)) + if (ret && maxlen > 0 && !WideCharToMultiByte( CP_ACP, 0, p, -1, retStr, maxlen, 0, 0)) retStr[maxlen-1] = 0; HeapFree( GetProcessHeap(), 0, p ); return ret;

1 0

Saulius Krasuckas : mscms: Move repetitive code to helper macros.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 2302d2b470d91b408ec51be5feeef44773060825 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2302d2b470d91b408ec51be… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Tue Dec 13 18:12:34 2005 +0100 mscms: Move repetitive code to helper macros. --- dlls/mscms/tests/profile.c | 106 +++++++++++++++++--------------------------- 1 files changed, 42 insertions(+), 64 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 5b0d86f..223dbc1 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -439,46 +439,35 @@ static void test_GetCountColorProfileEle } } +#define fail_GSCSPA(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ +do { \ + size = dwSz; \ + SetLastError(0); \ + ret = pGetStandardColorSpaceProfileA(pMachName, dwProfID, pProfName, pdwSz);\ + GLE = GetLastError(); \ + ok( !ret && GLE_OK, \ + "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); \ +} while (0) + static void test_GetStandardColorSpaceProfileA(void) { BOOL ret; - DWORD size, GLE; + DWORD size, sizeP, GLE; CHAR oldprofile[MAX_PATH]; CHAR newprofile[MAX_PATH]; + sizeP = sizeof(newprofile); + /* Parameter checks */ - SetLastError(0); - ret = pGetStandardColorSpaceProfileA( NULL, 0, newprofile, NULL ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_INVALID_PARAMETER, - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); - - SetLastError(0); - ret = pGetStandardColorSpaceProfileA( machine, 0, newprofile, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); - - size = 0; - - SetLastError(0); - ret = pGetStandardColorSpaceProfileA( NULL, 0, NULL, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); - - size = sizeof(newprofile); - - SetLastError(0); - ret = pGetStandardColorSpaceProfileA( NULL, 0, newprofile, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_FILE_NOT_FOUND, - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); + todo_wine + fail_GSCSPA(machine, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); + todo_wine + fail_GSCSPA(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPA(NULL, 0, NULL, &size, 0, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); + todo_wine + fail_GSCSPA(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); /* Functional checks */ @@ -504,46 +493,35 @@ static void test_GetStandardColorSpacePr } } +#define fail_GSCSPW(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ +do { \ + size = dwSz; \ + SetLastError(0); \ + ret = pGetStandardColorSpaceProfileW(pMachName, dwProfID, pProfName, pdwSz);\ + GLE = GetLastError(); \ + ok( !ret && GLE_OK, \ + "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); \ +} while (0) + static void test_GetStandardColorSpaceProfileW(void) { BOOL ret; - DWORD size, GLE; + DWORD size, sizeP, GLE; WCHAR oldprofile[MAX_PATH]; WCHAR newprofile[MAX_PATH]; + sizeP = sizeof(newprofile); + /* Parameter checks */ - SetLastError(0); - ret = pGetStandardColorSpaceProfileW( NULL, 0, newprofile, NULL ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_INVALID_PARAMETER, - "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); - - SetLastError(0); - ret = pGetStandardColorSpaceProfileW( machineW, 0, newprofile, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_INVALID_PARAMETER, - "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); - - size = 0; - - SetLastError(0); - ret = pGetStandardColorSpaceProfileW( NULL, 0, NULL, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); - - size = sizeof(newprofile); - - SetLastError(0); - ret = pGetStandardColorSpaceProfileW( NULL, 0, newprofile, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_FILE_NOT_FOUND, - "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); + todo_wine + fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPW(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPW(NULL, 0, NULL, &size, 0, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); + todo_wine + fail_GSCSPW(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); /* Functional checks */

1 0

Dmitry Timoshkov : x11drv: ScrollDC fix.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 930e8394a62c70d59ad8b9fb4a9527b7d738fbee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=930e8394a62c70d59ad8b9f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Dec 13 17:47:27 2005 +0100 x11drv: ScrollDC fix. There is no need to offset the source rectangle in the reverse direction before scrolling. --- dlls/x11drv/scroll.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/scroll.c b/dlls/x11drv/scroll.c index 005804a..78144da 100644 --- a/dlls/x11drv/scroll.c +++ b/dlls/x11drv/scroll.c @@ -94,27 +94,32 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I * rect are scrolled. So first combine Scroll and Clipping rectangles, * if available */ if( lprcScroll) + { if( lprcClip) IntersectRect( &rcClip, lprcClip, lprcScroll); else rcClip = *lprcScroll; + } else + { if( lprcClip) rcClip = *lprcClip; else GetClipBox( hdc, &rcClip); + } /* Then clip again to get the source rectangle that will remain in the * clipping rect */ rcSrc = rcClip; - OffsetRect( &rcSrc, -dx, -dy); IntersectRect( &rcSrc, &rcSrc, &rcClip); /* now convert to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcSrc, 2); + TRACE("source rect: %s\n", wine_dbgstr_rect(&rcSrc)); + /* also dx and dy */ SetRect(&offset, 0, 0, dx, dy); LPtoDP(hdc, (LPPOINT)&offset, 2); dxdev = offset.right - offset.left; - dydev= offset.bottom - offset.top; + dydev = offset.bottom - offset.top; /* now intersect with the visible region to get the pixels that will * actually scroll */ DstRgn = CreateRectRgnIndirect( &rcSrc); @@ -133,6 +138,8 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I SelectClipRgn( hdc, DstRgn); GetRgnBox( DstRgn, &rect); DPtoLP(hdc, (LPPOINT)&rect, 2); + TRACE("destination rect: %s\n", wine_dbgstr_rect(&rect)); + BitBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom -rect.top, hdc, rect.left - dx, rect.top - dy, SRCCOPY); @@ -149,7 +156,7 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I code = X11DRV_END_EXPOSURES; ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(ExpRgn), (LPSTR)&ExpRgn ); - /* Covert the combined clip rectangle to device coordinates */ + /* Convert the combined clip rectangle to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcClip, 2); if( hrgn ) SetRectRgn( hrgn, rcClip.left, rcClip.top, rcClip.right,

1 0

Aric Stewart : wininet: HTTP headers reworking.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 1e946d3e148a6d357fe322fbec78fd4c66b422db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e946d3e148a6d357fe322f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 13 17:07:41 2005 +0100 wininet: HTTP headers reworking. Redo how headers are handled, eliminating the concept of Standard Headers and allow all headers to be added multiple times. Allow querying of headers with an index to get the multiple headers. Respect response vs request headers in HttpQueryInfo. Add a number of tests to extensively test header adding and replacing. --- dlls/wininet/http.c | 678 ++++++++++++++++++++++----------------------- dlls/wininet/internet.c | 5 dlls/wininet/internet.h | 5 dlls/wininet/tests/http.c | 154 ++++++++++ 4 files changed, 496 insertions(+), 346 deletions(-)

1 0

Alexandre Julliard : gdi: Added support for doing GetBitmapBits on a DIB section.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 7e2be17d0f1442559dae38c2982bf4d424ace65a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e2be17d0f1442559dae38c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 17:07:06 2005 +0100 gdi: Added support for doing GetBitmapBits on a DIB section. Simply copy the DIB bits in that case. --- dlls/gdi/bitmap.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c index a0c6b25..5c2b6c3 100644 --- a/dlls/gdi/bitmap.c +++ b/dlls/gdi/bitmap.c @@ -307,6 +307,30 @@ LONG WINAPI GetBitmapBits( if (!bmp) return 0; + if (bmp->dib) /* simply copy the bits from the DIB */ + { + DIBSECTION *dib = bmp->dib; + const char *src = dib->dsBm.bmBits; + DWORD max = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; + if (count > max) count = max; + ret = count; + if (!bits) goto done; + + if (bmp->dib->dsBmih.biHeight >= 0) /* not top-down, need to flip contents vertically */ + { + src += dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; + while (count > 0) + { + src -= dib->dsBm.bmWidthBytes; + memcpy( bits, src, min( count, dib->dsBm.bmWidthBytes ) ); + bits = (char *)bits + dib->dsBm.bmWidthBytes; + count -= dib->dsBm.bmWidthBytes; + } + } + else memcpy( bits, src, count ); + goto done; + } + /* If the bits vector is null, the function should return the read size */ if(bits == NULL) {

1 0

Alexandre Julliard : x11drv: Clipping fix with DIB section copy.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 6b1e75d2785c72c1249a6b8bd89b62110e40b2ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b1e75d2785c72c1249a6b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 17:05:06 2005 +0100 x11drv: Clipping fix with DIB section copy. Use the GC of the destination device in X11DRV_DIB_CopyDIBSection so that the clipping region is taken into account. --- dlls/x11drv/dib.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c index 5666feb..5c6a2b9 100644 --- a/dlls/x11drv/dib.c +++ b/dlls/x11drv/dib.c @@ -4152,7 +4152,7 @@ static void X11DRV_DIB_DoProtectDIBSecti */ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB, void *colorMap, int nColorMap, - Drawable dest, + Drawable dest, GC gc, DWORD xSrc, DWORD ySrc, DWORD xDest, DWORD yDest, DWORD width, DWORD height) @@ -4202,7 +4202,7 @@ static void X11DRV_DIB_DoCopyDIBSection( /* Hack for now */ descr.drawable = dest; - descr.gc = BITMAP_GC(physBitmap); + descr.gc = gc; descr.xSrc = xSrc; descr.ySrc = ySrc; descr.xDest = xDest; @@ -4280,7 +4280,7 @@ void X11DRV_DIB_CopyDIBSection(X11DRV_PD } /* perform the copy */ X11DRV_DIB_DoCopyDIBSection(physBitmap, FALSE, colorMap, nColorMap, - physDevDst->drawable, xSrc, ySrc, + physDevDst->drawable, physDevDst->gc, xSrc, ySrc, physDevDst->org.x + xDest, physDevDst->org.y + yDest, width, height); /* free color mapping */ @@ -4299,8 +4299,8 @@ static void X11DRV_DIB_DoUpdateDIBSectio GetObjectW( physBitmap->hbitmap, sizeof(bitmap), &bitmap ); X11DRV_DIB_DoCopyDIBSection(physBitmap, toDIB, physBitmap->colorMap, physBitmap->nColorMap, - physBitmap->pixmap, 0, 0, 0, 0, - bitmap.bmWidth, bitmap.bmHeight); + physBitmap->pixmap, BITMAP_GC(physBitmap), + 0, 0, 0, 0, bitmap.bmWidth, bitmap.bmHeight); } /***********************************************************************

1 0