December 2011 - Wine-Commits

Alexandre Julliard : setupapi: Specify the correct binary file name when registering an executable.
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: f9c8afd320a71ed4a04fbbd199844738a84068b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c8afd320a71ed4a04fbbd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 18:09:18 2011 +0100 setupapi: Specify the correct binary file name when registering an executable. --- dlls/setupapi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index e73b769..947a512 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -549,7 +549,7 @@ static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path, memset( &startup, 0, sizeof(startup) ); startup.cb = sizeof(startup); TRACE( "executing %s\n", debugstr_w(cmd_line) ); - res = CreateProcessW( NULL, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &process_info ); + res = CreateProcessW( path, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &process_info ); HeapFree( GetProcessHeap(), 0, cmd_line ); if (!res) {

1 0

Nikolay Sivov : msxml3: Added IXMLDOMParseError2 support.
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: 0151f4741af3b554ef324faed3a3ad3b1c27ba70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0151f4741af3b554ef324faed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 14 15:42:23 2011 +0300 msxml3: Added IXMLDOMParseError2 support. --- dlls/msxml3/dispex.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/parseerror.c | 122 +++++++++++++++++++++++++++++-------------- dlls/msxml3/tests/domdoc.c | 10 ++++ 4 files changed, 94 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0151f4741af3b554ef324…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: b1c791c7d315742d305eed03bf9ecd552af7024d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c791c7d315742d305eed03b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 13 22:36:48 2011 +0100 po: Update French translation. --- po/fr.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index c364b1b..eebaf7a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-06 00:09+0100\n" +"PO-Revision-Date: 2011-12-13 22:35+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3494,9 +3494,8 @@ msgid "Subscript out of range" msgstr "Indice hors limites" #: jscript.rc:28 -#, fuzzy msgid "Object required" -msgstr "Objet attendu" +msgstr "Objet requis" #: jscript.rc:29 msgid "Automation server can't create object" @@ -6817,9 +6816,8 @@ msgid "&Data Rate" msgstr "&Débit de données" #: msvfw32.rc:52 -#, fuzzy msgid "kB/s" -msgstr "ko/sec" +msgstr "ko/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)"

1 0

Alexandre Julliard : gdi32/tests: Add some tests for behavior of 32-bit DDBs.
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: 6752d3478f450deb1ba4489c47984abccdf892b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6752d3478f450deb1ba4489c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 17:34:58 2011 +0100 gdi32/tests: Add some tests for behavior of 32-bit DDBs. --- dlls/gdi32/tests/bitmap.c | 72 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ba8ad84..9a34f63 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3601,22 +3601,24 @@ static void test_clipping(void) DeleteDC( hdcSrc ); } -static void test_32bit_bitmap_blt(void) +static void test_32bit_ddb(void) { - BITMAPINFO biDst; + char buffer[sizeof(BITMAPINFOHEADER) + sizeof(DWORD)]; + BITMAPINFO *biDst = (BITMAPINFO *)buffer; HBITMAP bmpSrc, bmpDst; HBITMAP oldSrc, oldDst; HDC hdcSrc, hdcDst, hdcScreen; - UINT32 *dstBuffer; - DWORD colorSrc = 0x11223344; - - memset(&biDst, 0, sizeof(BITMAPINFO)); - biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - biDst.bmiHeader.biWidth = 2; - biDst.bmiHeader.biHeight = -2; - biDst.bmiHeader.biPlanes = 1; - biDst.bmiHeader.biBitCount = 32; - biDst.bmiHeader.biCompression = BI_RGB; + HBRUSH brush; + DWORD *dstBuffer, *data; + DWORD colorSrc = 0x40201008; + + memset(biDst, 0, sizeof(BITMAPINFOHEADER)); + biDst->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst->bmiHeader.biWidth = 1; + biDst->bmiHeader.biHeight = -1; + biDst->bmiHeader.biPlanes = 1; + biDst->bmiHeader.biBitCount = 32; + biDst->bmiHeader.biCompression = BI_RGB; hdcScreen = CreateCompatibleDC(0); if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) @@ -3631,12 +3633,54 @@ static void test_32bit_bitmap_blt(void) oldSrc = SelectObject(hdcSrc, bmpSrc); hdcDst = CreateCompatibleDC(hdcScreen); - bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); oldDst = SelectObject(hdcDst, bmpDst); StretchBlt(hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, SRCCOPY); ok(dstBuffer[0] == colorSrc, "Expected color=%x, received color=%x\n", colorSrc, dstBuffer[0]); + if (pGdiAlphaBlend) + { + BLENDFUNCTION blend; + BOOL ret; + + blend.BlendOp = AC_SRC_OVER; + blend.BlendFlags = 0; + blend.SourceConstantAlpha = 128; + blend.AlphaFormat = 0; + dstBuffer[0] = 0x80808080; + ret = pGdiAlphaBlend( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, blend ); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + ok(dstBuffer[0] == 0x60504844, "wrong color %x\n", dstBuffer[0]); + blend.AlphaFormat = AC_SRC_ALPHA; + dstBuffer[0] = 0x80808080; + ret = pGdiAlphaBlend( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, blend ); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + ok(dstBuffer[0] == 0x90807874, "wrong color %x\n", dstBuffer[0]); + } + + data = (DWORD *)biDst->bmiColors; + data[0] = 0x20304050; + brush = CreateDIBPatternBrushPt( biDst, DIB_RGB_COLORS ); + ok( brush != 0, "brush creation failed\n" ); + SelectObject( hdcSrc, brush ); + PatBlt( hdcSrc, 0, 0, 1, 1, PATCOPY ); + BitBlt( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, SRCCOPY ); + ok(dstBuffer[0] == data[0], "Expected color=%x, received color=%x\n", data[0], dstBuffer[0]); + SelectObject( hdcSrc, GetStockObject(BLACK_BRUSH) ); + DeleteObject( brush ); + + biDst->bmiHeader.biBitCount = 24; + brush = CreateDIBPatternBrushPt( biDst, DIB_RGB_COLORS ); + ok( brush != 0, "brush creation failed\n" ); + SelectObject( hdcSrc, brush ); + PatBlt( hdcSrc, 0, 0, 1, 1, PATCOPY ); + BitBlt( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, SRCCOPY ); + ok(dstBuffer[0] == (data[0] & ~0xff000000), + "Expected color=%x, received color=%x\n", data[0] & 0xff000000, dstBuffer[0]); + SelectObject( hdcSrc, GetStockObject(BLACK_BRUSH) ); + DeleteObject( brush ); + /* Tidy up */ SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); @@ -5259,7 +5303,7 @@ START_TEST(bitmap) test_StretchDIBits(); test_GdiAlphaBlend(); test_GdiGradientFill(); - test_32bit_bitmap_blt(); + test_32bit_ddb(); test_bitmapinfoheadersize(); test_get16dibits(); test_clipping();

1 0

Alexandre Julliard : winex11: Add missing initialization of pattern brush style.
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: 59f790af046899b68744e80d7fafa72c25adbe41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f790af046899b68744e80d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 17:35:21 2011 +0100 winex11: Add missing initialization of pattern brush style. --- dlls/winex11.drv/xrender.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 02625eb..10e6cda 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2690,6 +2690,7 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap physdev->x11dev->brush.pixmap = pixmap; physdev->x11dev->brush.fillStyle = FillTiled; physdev->x11dev->brush.pixel = 0; /* ignored */ + physdev->x11dev->brush.style = BS_PATTERN; wine_tsx11_unlock(); X11DRV_DIB_Unlock( physbitmap, TRUE );

1 0

Alexandre Julliard : kernel32: Don' t run a nonexistent builtin from CreateProcess when filename is not specified .
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: fe7652d0aff8a3c419190f51031a40af81c9de3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7652d0aff8a3c419190f510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 20:25:53 2011 +0100 kernel32: Don't run a nonexistent builtin from CreateProcess when filename is not specified. --- dlls/kernel32/process.c | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0fc2c2b..ad389ec 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -242,24 +242,15 @@ static HANDLE open_exe_file( const WCHAR *name, struct binary_info *binary_info * * Open an exe file, and return the full name and file handle. * Returns FALSE if file could not be found. - * If file exists but cannot be opened, returns TRUE and set handle to INVALID_HANDLE_VALUE. - * If file is a builtin exe, returns TRUE and sets handle to 0. */ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE *handle, struct binary_info *binary_info ) { TRACE("looking for %s\n", debugstr_w(name) ); - if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL )) - { - if (contains_path( name ) && get_builtin_path( name, exeW, buffer, buflen, binary_info )) - { - *handle = 0; - return TRUE; - } + if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL ) && /* no builtin found, try native without extension in case it is a Unix app */ - if (!SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) return FALSE; - } + !SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) return FALSE; TRACE( "Trying native exe %s\n", debugstr_w(buffer) ); if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, @@ -2173,11 +2164,7 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, memcpy( name, cmdline + 1, len * sizeof(WCHAR) ); name[len] = 0; - if (!find_exe_file( name, buffer, buflen, handle, binary_info )) - { - if (!get_builtin_path( name, exeW, buffer, buflen, binary_info )) goto done; - *handle = 0; - } + if (!find_exe_file( name, buffer, buflen, handle, binary_info )) goto done; ret = cmdline; /* no change necessary */ goto done; } @@ -2205,13 +2192,7 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, if (!ret) { - if (first_space) *first_space = 0; /* try only the first word as a builtin */ - if (get_builtin_path( name, exeW, buffer, buflen, binary_info )) - { - *handle = 0; - ret = cmdline; - } - else SetLastError( ERROR_FILE_NOT_FOUND ); + SetLastError( ERROR_FILE_NOT_FOUND ); } else if (first_space) /* build a new command-line with quotes */ {

1 0

Francois Gouget : include: Remove unneeded extern "C" directives.
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: 3e1af081c02b01b513137d33b3972fb0d34e811d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1af081c02b01b513137d33b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:12:20 2011 +0100 include: Remove unneeded extern "C" directives. --- include/vsstyle.h | 7 ------- include/vssym32.h | 7 ------- 2 files changed, 0 insertions(+), 14 deletions(-) diff --git a/include/vsstyle.h b/include/vsstyle.h index ce9f7c7..e6fb1a3 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -19,9 +19,6 @@ #ifndef __VSSTYLE_H__ #define __VSSTYLE_H__ -#ifdef __cplusplus -extern "C" { -#endif #define TMTVS_RESERVEDLOW 100000 #define TMTVS_RESERVEDHIGH 19999 @@ -1739,8 +1736,4 @@ enum CLOSEBUTTONSTATES { CBS_DISABLED = 4, }; -#ifdef __cplusplus -} -#endif - #endif /* __VSSTYLE_H__ */ diff --git a/include/vssym32.h b/include/vssym32.h index c58be0b..3536462 100644 --- a/include/vssym32.h +++ b/include/vssym32.h @@ -21,9 +21,6 @@ #include "vsstyle.h" -#ifdef __cplusplus -extern "C" { -#endif enum BGTYPE { BT_IMAGEFILE = 0, @@ -678,8 +675,4 @@ enum MENUBANDSTATES { MDS_HOTCHECKED = 6, }; -#ifdef __cplusplus -} -#endif - #endif /* __VSSYM32_H__ */

1 0

Francois Gouget : include: Split iprtrmib.h into multiple mib.h files.
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: cf76be61b2e151df155b29e021b5d915f4dd0440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf76be61b2e151df155b29e02… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:04:41 2011 +0100 include: Split iprtrmib.h into multiple mib.h files. Include them where appropriate. --- include/Makefile.in | 4 + include/ifmib.h | 65 +++++++++++++ include/ipmib.h | 165 +++++++++++++++++++++++++++++++++ include/iprtrmib.h | 257 +-------------------------------------------------- include/nldef.h | 19 ++++ include/tcpmib.h | 79 ++++++++++++++++ include/udpmib.h | 48 ++++++++++ 7 files changed, 383 insertions(+), 254 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf76be61b2e151df155b2…

1 0

Francois Gouget : include: Add the Dll(Un)RegisterServer() prototypes to olectl.h.
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: a78067fee3fca78d49515c850c81c92f544a3dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78067fee3fca78d49515c850… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:10:45 2011 +0100 include: Add the Dll(Un)RegisterServer() prototypes to olectl.h. --- include/olectl.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index cda17f6..3ccf09c 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -183,6 +183,10 @@ typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; #define LP_VGACOLOR 0x2 #define LP_COLOR 0x4 +HRESULT WINAPI DllRegisterServer(void); + +HRESULT WINAPI DllUnregisterServer(void); + HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon); HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams);

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetVector().
by Alexandre Julliard Dec. 14, 2011

Dec. 14, 2011

Module: wine Branch: master Commit: 67591832a34828a85b394e61b401f2e4a165f57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67591832a34828a85b394e61b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 13 17:02:34 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetVector(). --- dlls/d3dx9_36/effect.c | 54 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d9cd085..1e86aa2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -919,6 +919,16 @@ static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indat } } +static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) +{ + UINT i; + + for (i = 0; i < param->columns; ++i) + { + set_number((FLOAT *)param->data + i, param->type, (FLOAT *)vector + i, D3DXPT_FLOAT); + } +} + static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { unsigned int i, k; @@ -2020,13 +2030,51 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloatArray(ID3DXBaseEffect *iface, return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect* iface, D3DXHANDLE parameter, CONST D3DXVECTOR4* vector) +static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXVECTOR4 *vector) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, vector %p stub\n", This, parameter, vector); + TRACE("iface %p, parameter %p, vector %p\n", This, parameter, vector); - return E_NOTIMPL; + if (param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + if (param->type == D3DXPT_INT && param->bytes == 4) + { + DWORD tmp; + + TRACE("INT fixup\n"); + tmp = (DWORD)(max(min(vector->z, 1.0f), 0.0f) * INT_FLOAT_MULTI); + tmp += ((DWORD)(max(min(vector->y, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; + tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; + tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; + + *(INT *)param->data = tmp; + return D3D_OK; + } + set_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetVector(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector)

1 0