October 2011 - Wine-Commits

Alexandre Julliard : gdi32: Add a check for null bitfields in SetDIBits.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 34310d44792b334d4995b1830c4137d9b764eba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34310d44792b334d4995b1830… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 00:43:05 2011 +0200 gdi32: Add a check for null bitfields in SetDIBits. --- dlls/gdi32/dib.c | 9 +++++++++ dlls/gdi32/tests/bitmap.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 56efda7..20041ad 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -519,6 +519,15 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (src_info->bmiHeader.biCompression == BI_BITFIELDS) + { + DWORD *masks = (DWORD *)src_info->bmiColors; + if (!masks[0] || !masks[1] || !masks[2]) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + } src_bits.ptr = (void *)bits; src_bits.is_copy = FALSE; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index eaf96a5..e069fa8 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -976,7 +976,7 @@ static void test_dib_formats(void) hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); - todo_wine ok( !ret, "SetDIBits succeeded with null bitfields\n" ); + ok( !ret, "SetDIBits succeeded with null bitfields\n" ); /* other functions don't check */ hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib != NULL, "CreateDIBitmap failed with null bitfields\n" ); @@ -984,7 +984,7 @@ static void test_dib_formats(void) ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); ok( ret, "SetDIBitsToDevice failed with null bitfields\n" ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY ); - ok( ret, "StretchDIBits failed with null bitfields\n" ); + todo_wine ok( ret, "StretchDIBits failed with null bitfields\n" ); ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_RGB_COLORS); ok( ret, "GetDIBits failed with null bitfields\n" ); bi->bmiHeader.biPlanes = 1; @@ -1004,7 +1004,7 @@ static void test_dib_formats(void) hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); - todo_wine ok( !ret, "SetDIBits succeeded with null bitfields\n" ); + ok( !ret, "SetDIBits succeeded with null bitfields\n" ); /* garbage is ok though */ *(DWORD *)&bi->bmiColors[0] = 0x55;

1 0

Piotr Caban : msvcp90: Added basic_string::operator[] implementation.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 700e1da5c29e87308a2681ae9b03e7f879350515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=700e1da5c29e87308a2681ae9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 14:09:09 2011 +0200 msvcp90: Added basic_string::operator[] implementation. --- dlls/msvcp90/msvcp90.spec | 32 ++++++------ dlls/msvcp90/string.c | 130 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 124 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=700e1da5c29e87308a268…

1 0

Alexandre Julliard : gdi32: Add support for arbitrary DIB bitfields for 16-bpp conversions.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 587f492fdf9341a535e262d7d8cdb85a326996e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587f492fdf9341a535e262d7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 00:12:04 2011 +0200 gdi32: Add support for arbitrary DIB bitfields for 16-bpp conversions. --- dlls/gdi32/dibdrv/primitives.c | 162 +++++++++++++++++++++++++++++++++++----- dlls/gdi32/tests/bitmap.c | 55 +++----------- 2 files changed, 156 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=587f492fdf9341a535e26…

1 0

Alistair Leslie-Hughes : mscoree: Register interfaces.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: b2ef9218ec2a61634885f9a3b7666d8450314548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ef9218ec2a61634885f9a3b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 11 16:08:00 2011 +1100 mscoree: Register interfaces. --- dlls/mscoree/Makefile.in | 2 + dlls/mscoree/mscoree_classes.idl | 72 ++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 11 ++++-- 3 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index a39c696..114b130 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -10,4 +10,6 @@ C_SRCS = \ metahost.c \ mscoree_main.c +IDL_R_SRCS = mscoree_classes.idl + @MAKE_DLL_RULES@ diff --git a/dlls/mscoree/mscoree_classes.idl b/dlls/mscoree/mscoree_classes.idl new file mode 100644 index 0000000..692210e --- /dev/null +++ b/dlls/mscoree/mscoree_classes.idl @@ -0,0 +1,72 @@ +/* + * Copyright 2011 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("Microsoft Common Language Runtime Host V2"), + threading(both), + progid("CLRMetaData.CLRRuntimeHost.1"), + vi_progid("CLRMetaData.CLRRuntimeHost"), + uuid(90F1A06E-7712-4762-86B5-7A5EBA6BDB01), +] +coclass ICLRRuntimeHost +{ +} + +[ + helpstring("Microsoft Common Language Runtime Host V2"), + threading(both), + progid("CLRMetaData.CLRRuntimeHost.2"), + vi_progid("CLRMetaData.CLRRuntimeHost"), + uuid(90F1A06E-7712-4762-86B5-7A5EBA6BDB02), +] +coclass CLRRuntimeHost +{ +} + +[ + helpstring("Microsoft Common Language Runtime Meta Data"), + threading(both), + progid("CLRMetaData.CorMetaDataDispenser.2"), + vi_progid("CLRMetaData.CorMetaDataDispenser"), + uuid(E5CB7A31-7512-11D2-89CE-0080C792E5D8), +] +coclass CorMetaDataDispenser +{ +} + +[ + helpstring("Microsoft Common Language Runtime Meta Data"), + threading(both), + progid("CLRMetaData.CorMetaDataDispenserRuntime.2"), + vi_progid("CLRMetaData.CorMetaDataDispenserRuntime"), + uuid(1EC2DE53-75CC-11d2-9775-00A0C9B4D50C), +] +coclass CorMetaDataDispenserRuntime +{ +} + +[ + helpstring("Microsoft Common Language Runtime Host"), + threading(both), + progid("CLRMetaData.CorRuntimeHost.2"), + vi_progid("CLRMetaData.CorRuntimeHost"), + uuid(CB2F6723-AB3A-11d2-9C40-00C04FA30A3E), +] +coclass CorRuntimeHost +{ +} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 64c226f..8b72ec8 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -44,11 +44,14 @@ #include "fusion.h" #include "wine/list.h" #include "mscoree_private.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +static HINSTANCE MSCOREE_hInstance; + char *WtoA(LPCWSTR wstr) { int length; @@ -116,6 +119,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + MSCOREE_hInstance = hinstDLL; + switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -508,14 +513,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) HRESULT WINAPI DllRegisterServer(void) { - FIXME("\n"); - return S_OK; + return __wine_register_resources( MSCOREE_hInstance ); } HRESULT WINAPI DllUnregisterServer(void) { - FIXME("\n"); - return S_OK; + return __wine_unregister_resources( MSCOREE_hInstance ); } HRESULT WINAPI DllCanUnloadNow(VOID)

1 0

Piotr Caban : msvcp90: Added basic_string<wchar>::replace implementation.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: fcf59687d54b01acc7726a41817bc4921d793833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf59687d54b01acc7726a418… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 14:08:52 2011 +0200 msvcp90: Added basic_string<wchar>::replace implementation. --- dlls/msvcp90/msvcp90.spec | 20 ++++---- dlls/msvcp90/string.c | 119 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcf59687d54b01acc7726…

1 0

Francois Gouget : comctl32/tests: Make impl_from_IStream() static.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 07cfe3ea51f1f0a49befa82fe4637a1abb74ae0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cfe3ea51f1f0a49befa82fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 13 12:15:33 2011 +0200 comctl32/tests: Make impl_from_IStream() static. --- dlls/comctl32/tests/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 36c9b65..f783ce6 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -579,7 +579,7 @@ struct my_IStream ULONG iml_data_size; }; -struct my_IStream *impl_from_IStream(IStream *iface) +static struct my_IStream *impl_from_IStream(IStream *iface) { return CONTAINING_RECORD(iface, struct my_IStream, IStream_iface); }

1 0

Hans Leidekker : cryptnet: Respect proxy settings.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: a552a7a9f5b69c4b7fb1bc457c48bcd868bef9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a552a7a9f5b69c4b7fb1bc457… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 13 10:14:16 2011 +0200 cryptnet: Respect proxy settings. --- dlls/cryptnet/cryptnet_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 6464908..e7f9f46 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -827,7 +827,7 @@ static BOOL CRYPT_Connect(const URL_COMPONENTSW *components, components->nPort, context, pCredentials, phInt, phInt); *phHost = NULL; - *phInt = InternetOpenW(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, + *phInt = InternetOpenW(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, context ? INTERNET_FLAG_ASYNC : 0); if (*phInt) {

1 0

Matteo Bruni : wined3d: Remove an obsolete comment.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 35f7610630fe002afa4e6584b9f0968857bbd90c URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f7610630fe002afa4e6584b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 12 22:44:47 2011 +0200 wined3d: Remove an obsolete comment. --- dlls/wined3d/directx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e63add..2ae9f7f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4313,9 +4313,6 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap return hr; } -/* Note: d3d8 passes in a pointer to a D3DCAPS8 structure, which is a true - subset of a D3DCAPS9 structure. However, it has to come via a void * - as the d3d8 interface cannot import the d3d9 header */ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, WINED3DCAPS *caps) {

1 0

Piotr Caban : msvcp90: Added basic_string<char>::replace implementation.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 70d61b5fb97d819f6cb163e676a8337ebc52705b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d61b5fb97d819f6cb163e67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 14:08:40 2011 +0200 msvcp90: Added basic_string<char>::replace implementation. --- dlls/msvcp90/msvcp90.spec | 20 ++++---- dlls/msvcp90/string.c | 119 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70d61b5fb97d819f6cb16…

1 0

Piotr Caban : msvcp90: Added basic_string::find_first_not_of implementation .
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 5fa8e6b1b35117dd46e2e27ca8cc7001f0ef966d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa8e6b1b35117dd46e2e27ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 14:07:46 2011 +0200 msvcp90: Added basic_string::find_first_not_of implementation. --- dlls/msvcp90/msvcp90.spec | 32 +++++++------- dlls/msvcp90/string.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fa8e6b1b35117dd46e2e…

1 0