June 2013 - Wine-commits - list.winehq.org

André Hentschel : winemaker: Use utf-8 for stdout.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 5b2d515763e8b7da388c831b94c0fafedcd2ee8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b2d515763e8b7da388c831b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 16 20:55:04 2013 +0200 winemaker: Use utf-8 for stdout. --- tools/winemaker | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index dc94f7d..c6eb480 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -2,7 +2,7 @@ use utf8; use strict; -# Copyright 2000-2004 Francois Gouget for CodeWeavers +# Copyright 2000-2004 François Gouget for CodeWeavers # Copyright 2004 Dimitrie O. Paun # Copyright 2009-2012 André Hentschel # @@ -2669,7 +2669,7 @@ $opt_no_banner=0; sub print_banner() { print "Winemaker $version\n"; - print "Copyright 2000-2004 Francois Gouget <fgouget\(a)codeweavers.com> for CodeWeavers\n"; + print "Copyright 2000-2004 François Gouget <fgouget\(a)codeweavers.com> for CodeWeavers\n"; print "Copyright 2004 Dimitrie O. Paun\n"; print "Copyright 2009-2012 André Hentschel\n"; } @@ -2693,6 +2693,8 @@ sub usage() exit (2); } +binmode(STDOUT, ":utf8"); + target_init(\@global_settings); foreach(@ARGV) {

1 0

Dmitry Timoshkov : comctl32: Use default GUI font as a fallback instead of a (non-existent) Arial.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: cc086f09ae46c77e6eb4a817ae567294d3f795ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc086f09ae46c77e6eb4a817a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 17 12:31:58 2013 +0900 comctl32: Use default GUI font as a fallback instead of a (non-existent) Arial. --- dlls/comctl32/tab.c | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 229e72b..bd75c88 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1898,7 +1898,6 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect /* Draw the text */ if(infoPtr->dwStyle & TCS_VERTICAL) /* if we are vertical rotate the text and each character */ { - static const WCHAR ArialW[] = { 'A','r','i','a','l',0 }; LOGFONTW logfont; HFONT hFont = 0; INT nEscapement = 900; @@ -1911,21 +1910,11 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect } /* to get a font with the escapement and orientation we are looking for, we need to */ - /* call CreateFontIndirectA, which requires us to set the values of the logfont we pass in */ + /* call CreateFontIndirect, which requires us to set the values of the logfont we pass in */ if (!GetObjectW((infoPtr->hFont) ? - infoPtr->hFont : GetStockObject(SYSTEM_FONT), + infoPtr->hFont : GetStockObject(DEFAULT_GUI_FONT), sizeof(LOGFONTW),&logfont)) - { - INT iPointSize = 9; - - lstrcpyW(logfont.lfFaceName, ArialW); - logfont.lfHeight = -MulDiv(iPointSize, GetDeviceCaps(hdc, LOGPIXELSY), - 72); - logfont.lfWeight = FW_NORMAL; - logfont.lfItalic = 0; - logfont.lfUnderline = 0; - logfont.lfStrikeOut = 0; - } + GetStockObject(DEFAULT_GUI_FONT); logfont.lfEscapement = nEscapement; logfont.lfOrientation = nOrientation;

1 0

Bernhard Übelacker : winedbg: Call DebugActiveProcessStop when detaching.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: b62b740de20269fc4c785faac4b51a314fee7cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b62b740de20269fc4c785faac… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Fri Jun 14 23:28:35 2013 +0200 winedbg: Call DebugActiveProcessStop when detaching. --- programs/winedbg/tgt_active.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index a264a67..0c8e869 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -946,7 +946,8 @@ static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, DBG_CONTINUE); } } - else + + if (!kill) { if (!DebugActiveProcessStop(pcs->pid)) return FALSE; }

1 0

Henri Verbeet : wined3d: Avoid the position_float4() fixup if the vertex pipe can handle pre-transformed vertices itself.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 4272d92f93fc9d458822da0b738f2a084e405c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4272d92f93fc9d458822da0b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 17 09:07:48 2013 +0200 wined3d: Avoid the position_float4() fixup if the vertex pipe can handle pre-transformed vertices itself. --- dlls/wined3d/directx.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c97225c..760fa34 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4682,12 +4682,18 @@ static void WINE_GLAPI warn_no_specular_func(const void *data) WARN("GL_EXT_secondary_color not supported\n"); } -static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) +static void wined3d_adapter_init_ffp_attrib_ops(const struct wined3d_adapter *adapter) { + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + position_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT2] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT3] = (glAttribFunc)gl_info->gl_ops.gl.p_glVertex3fv; - position_funcs[WINED3D_FFP_EMIT_FLOAT4] = position_float4; + if (!d3d_info->xyzrhw) + position_funcs[WINED3D_FFP_EMIT_FLOAT4] = position_float4; + else + position_funcs[WINED3D_FFP_EMIT_FLOAT4] = (glAttribFunc)gl_info->gl_ops.gl.p_glVertex4fv; position_funcs[WINED3D_FFP_EMIT_D3DCOLOR] = position_d3dcolor; position_funcs[WINED3D_FFP_EMIT_UBYTE4] = invalid_func; position_funcs[WINED3D_FFP_EMIT_SHORT2] = invalid_func; @@ -5031,7 +5037,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - fillGLAttribFuncs(&adapter->gl_info); + wined3d_adapter_init_ffp_attrib_ops(adapter); return TRUE; }

1 0

Alexandre Julliard : widl: Avoid short printf formats with int variables.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 7ca08fee557d934533b339624767e63bbd085cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca08fee557d934533b339624… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 11:13:57 2013 +0200 widl: Avoid short printf formats with int variables. --- tools/widl/typegen.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index cab4276..6527437 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1158,7 +1158,7 @@ static unsigned int write_new_procformatstring_type(FILE *file, int indent, cons if (flags >> 13) sprintf( buffer + strlen(buffer), " srv size=%u,", (flags >> 13) * 8 ); strcpy( buffer + strlen( buffer ) - 1, " */" ); print_file( file, indent, "NdrFcShort(0x%hx),\t%s\n", flags, buffer ); - print_file( file, indent, "NdrFcShort(0x%hx), /* stack offset = %hu */\n", + print_file( file, indent, "NdrFcShort(0x%x), /* stack offset = %u */\n", *stack_offset, *stack_offset ); if (flags & IsBasetype) { @@ -1332,7 +1332,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, print_file( file, indent, "0x%02x,\n", oi_flags ); print_file( file, indent, "NdrFcLong(0x%x),\n", rpc_flags ); print_file( file, indent, "NdrFcShort(0x%hx),\t/* method %hu */\n", num_proc, num_proc ); - print_file( file, indent, "NdrFcShort(0x%hx),\t/* stack size = %hu */\n", stack_size, stack_size ); + print_file( file, indent, "NdrFcShort(0x%x),\t/* stack size = %u */\n", stack_size, stack_size ); *offset += 10; if (!implicit_fc) @@ -1380,9 +1380,9 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, if (is_attr( func->attrs, ATTR_NOTIFYFLAG )) ext_flags |= 0x10; /* HasNotify2 */ size = get_function_buffer_size( func, PASS_IN ); - print_file( file, indent, "NdrFcShort(0x%x),\t/* client buffer = %hu */\n", size, size ); + print_file( file, indent, "NdrFcShort(0x%x),\t/* client buffer = %u */\n", size, size ); size = get_function_buffer_size( func, PASS_OUT ); - print_file( file, indent, "NdrFcShort(0x%x),\t/* server buffer = %hu */\n", size, size ); + print_file( file, indent, "NdrFcShort(0x%x),\t/* server buffer = %u */\n", size, size ); print_file( file, indent, "0x%02x,\n", oi2_flags ); print_file( file, indent, "0x%02x,\t/* %u params */\n", nb_args, nb_args ); print_file( file, indent, "0x%02x,\n", pointer_size == 8 ? 10 : 8 );

1 0

Alexandre Julliard : user.exe: Always pass a resource size to CreateIconFromResourceEx16.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 4894711768695e19a9f1f0b29efeb99574314e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4894711768695e19a9f1f0b29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 11:14:20 2013 +0200 user.exe: Always pass a resource size to CreateIconFromResourceEx16. --- dlls/user.exe16/user.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index b99c0ad..9500f59 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2094,6 +2094,7 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c { HGLOBAL16 handle; HRSRC16 hRsrc, hGroupRsrc; + DWORD size; if (!hinst || (flags & LR_LOADFROMFILE)) { @@ -2129,7 +2130,6 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c BITMAPFILEHEADER header; WCHAR path[MAX_PATH], filename[MAX_PATH]; HANDLE file; - DWORD size; filename[0] = 0; if (!(hRsrc = FindResource16( hinst, name, (LPCSTR)RT_BITMAP ))) return 0; @@ -2186,7 +2186,8 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c if (!(handle = LoadResource16( hinst, hRsrc ))) return 0; bits = LockResource16( handle ); - hIcon = CreateIconFromResourceEx16( bits, 0, type == IMAGE_ICON, 0x00030000, cx, cy, flags ); + size = SizeofResource16( hinst, hRsrc ); + hIcon = CreateIconFromResourceEx16( bits, size, type == IMAGE_ICON, 0x00030000, cx, cy, flags ); FreeResource16( handle ); if (hIcon && (flags & LR_SHARED)) add_shared_icon( hinst, hRsrc, hGroupRsrc, hIcon ); @@ -2734,7 +2735,7 @@ WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType ) */ HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew ) { - return CreateIconFromResourceEx16( LockResource16( hResource ), 0, TRUE, + return CreateIconFromResourceEx16( LockResource16( hResource ), 0xffff, TRUE, bNew ? 0x00030000 : 0x00020000, 0, 0, LR_DEFAULTCOLOR ); }

1 0

Rico Schüller : d3dx9: Apply rotationcenter only when a rotation is done.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: ee664704772f4392625f09fd246535b343120863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee664704772f4392625f09fd2… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 17 09:56:20 2013 +0200 d3dx9: Apply rotationcenter only when a rotation is done. --- dlls/d3dx9_36/math.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 43911e9..e0cab9e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -102,13 +102,6 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin D3DXMatrixIdentity(out); - if (rotationcenter) - { - out->u.m[3][0] = -rotationcenter->x; - out->u.m[3][1] = -rotationcenter->y; - out->u.m[3][2] = -rotationcenter->z; - } - if (rotation) { FLOAT temp00, temp01, temp02, temp10, temp11, temp12, temp20, temp21, temp22; @@ -135,15 +128,12 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin if (rotationcenter) { - FLOAT x, y, z; - - x = out->u.m[3][0]; - y = out->u.m[3][1]; - z = out->u.m[3][2]; - - out->u.m[3][0] = x * temp00 + y * temp10 + z * temp20; - out->u.m[3][1] = x * temp01 + y * temp11 + z * temp21; - out->u.m[3][2] = x * temp02 + y * temp12 + z * temp22; + out->u.m[3][0] = rotationcenter->x * (1.0f - temp00) - rotationcenter->y * temp10 + - rotationcenter->z * temp20; + out->u.m[3][1] = rotationcenter->y * (1.0f - temp11) - rotationcenter->x * temp01 + - rotationcenter->z * temp21; + out->u.m[3][2] = rotationcenter->z * (1.0f - temp22) - rotationcenter->x * temp02 + - rotationcenter->y * temp12; } } else @@ -153,13 +143,6 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin out->u.m[2][2] = scaling; } - if (rotationcenter) - { - out->u.m[3][0] += rotationcenter->x; - out->u.m[3][1] += rotationcenter->y; - out->u.m[3][2] += rotationcenter->z; - } - if (translation) { out->u.m[3][0] += translation->x;

1 0

Alexandre Julliard : inetcomm: Only set the command type when the command expects a reply.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 1020a7b00fabc42968de65990c5a36af81f1b3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1020a7b00fabc42968de65990… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 12:47:18 2013 +0200 inetcomm: Only set the command type when the command expects a reply. --- dlls/inetcomm/pop3transport.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index bdae830..d275f21 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -311,11 +311,10 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) } } -static void init_parser(POP3Transport *This, POP3COMMAND command, POP3CMDTYPE type) +static void init_parser(POP3Transport *This, POP3COMMAND command) { This->state = STATE_NONE; This->command = command; - This->type = type; } static HRESULT POP3Transport_ParseResponse(POP3Transport *This, char *pszResponse, POP3RESPONSE *pResponse) @@ -659,7 +658,7 @@ static void POP3Transport_CallbackProcessUSERResp(IInternetTransport *iface, cha strcat(command, This->InetTransport.ServerInfo.szPassword); strcat(command, "\r\n"); - init_parser(This, POP3_PASS, POP3_NONE); + init_parser(This, POP3_PASS); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); HeapFree(GetProcessHeap(), 0, command); @@ -800,7 +799,7 @@ static HRESULT WINAPI POP3Transport_Connect(IPOP3Transport *iface, if (FAILED(hr)) return hr; - init_parser(This, POP3_USER, POP3_NONE); + init_parser(This, POP3_USER); return InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackSendUSERCmd); } @@ -885,7 +884,7 @@ static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR use strcat(command, username); strcat(command, "\r\n"); - init_parser(This, POP3_USER, POP3_NONE); + init_parser(This, POP3_USER); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUSERResp); HeapFree(GetProcessHeap(), 0, command); @@ -908,7 +907,7 @@ static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR pas strcat(command, password); strcat(command, "\r\n"); - init_parser(This, POP3_PASS, POP3_NONE); + init_parser(This, POP3_PASS); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); HeapFree(GetProcessHeap(), 0, command); @@ -934,7 +933,8 @@ static HRESULT WINAPI POP3Transport_CommandLIST( } else command = list_all; - init_parser(This, POP3_LIST, cmdtype); + init_parser(This, POP3_LIST); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvLISTResp); if (dwPopId) HeapFree(GetProcessHeap(), 0, command); @@ -956,7 +956,8 @@ static HRESULT WINAPI POP3Transport_CommandTOP( sprintf(command, top, dwPopId, cPreviewLines); This->preview_lines = cPreviewLines; - init_parser(This, POP3_TOP, cmdtype); + init_parser(This, POP3_TOP); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvTOPResp); HeapFree(GetProcessHeap(), 0, command); @@ -972,7 +973,7 @@ static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) InternetTransport_ChangeStatus(&This->InetTransport, IXP_DISCONNECTING); - init_parser(This, POP3_QUIT, POP3_NONE); + init_parser(This, POP3_QUIT); return InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvQUITResp); } @@ -983,7 +984,7 @@ static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface) TRACE("\n"); - init_parser(This, POP3_STAT, POP3_NONE); + init_parser(This, POP3_STAT); InternetTransport_DoCommand(&This->InetTransport, stat, POP3Transport_CallbackRecvSTATResp); return S_OK; } @@ -995,7 +996,7 @@ static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface) TRACE("\n"); - init_parser(This, POP3_NOOP, POP3_NONE); + init_parser(This, POP3_NOOP); InternetTransport_DoCommand(&This->InetTransport, noop, POP3Transport_CallbackRecvNOOPResp); return S_OK; } @@ -1007,7 +1008,7 @@ static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface) TRACE("\n"); - init_parser(This, POP3_RSET, POP3_NONE); + init_parser(This, POP3_RSET); InternetTransport_DoCommand(&This->InetTransport, rset, POP3Transport_CallbackRecvRSETResp); return S_OK; } @@ -1031,7 +1032,8 @@ static HRESULT WINAPI POP3Transport_CommandUIDL( } else command = uidl_all; - init_parser(This, POP3_UIDL, cmdtype); + init_parser(This, POP3_UIDL); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUIDLResp); if (dwPopId) HeapFree(GetProcessHeap(), 0, command); @@ -1052,7 +1054,8 @@ static HRESULT WINAPI POP3Transport_CommandDELE( if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; sprintf(command, dele, dwPopId); - init_parser(This, POP3_DELE, cmdtype); + init_parser(This, POP3_DELE); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvDELEResp); HeapFree(GetProcessHeap(), 0, command); @@ -1073,7 +1076,8 @@ static HRESULT WINAPI POP3Transport_CommandRETR( if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; sprintf(command, retr, dwPopId); - init_parser(This, POP3_RETR, cmdtype); + init_parser(This, POP3_RETR); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvRETRResp); HeapFree(GetProcessHeap(), 0, command);

1 0

Alexandre Julliard : windowscodecs/tests: Pass the correct constant to IWICImagingFactory_CreateBitmapFromHBITMAP.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 0fc73914e262f6ee4dc99d03bdf327a6d89a5f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc73914e262f6ee4dc99d03b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 12:47:43 2013 +0200 windowscodecs/tests: Pass the correct constant to IWICImagingFactory_CreateBitmapFromHBITMAP. --- dlls/windowscodecs/tests/bitmap.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 742f45f..5b78bf9 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -651,15 +651,15 @@ static void test_CreateBitmapFromHBITMAP(void) hbmp = create_dib(3, 3, 8, NULL, data_8bpp_rgb_dib); ok(hbmp != 0, "failed to create bitmap\n"); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, 0, 0, WICBitmapCacheOnLoad, &bitmap); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, 0, 0, WICBitmapIgnoreAlpha, &bitmap); todo_wine ok(hr == WINCODEC_ERR_WIN32ERROR || hr == 0x88980003 /*XP*/, "expected WINCODEC_ERR_WIN32ERROR, got %#x\n", hr); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, NULL); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapIgnoreAlpha, NULL); todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, &bitmap); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapIgnoreAlpha, &bitmap); todo_wine ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); if (hr != S_OK) return; @@ -691,7 +691,7 @@ todo_wine ok(hpal != 0, "CreatePalette failed\n"); hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapIgnoreAlpha, &bitmap); ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); IWICBitmap_GetPixelFormat(bitmap, &format); @@ -731,7 +731,7 @@ todo_wine ok(hpal != 0, "CreatePalette failed\n"); hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapIgnoreAlpha, &bitmap); ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); IWICBitmap_GetPixelFormat(bitmap, &format);

1 0

Alexandre Julliard : user32: Check the correct id for the close button when setting the font.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 9ac7cc83111e55f008120a4e7d7f1a7340408a64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac7cc83111e55f008120a4e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 13:22:23 2013 +0200 user32: Check the correct id for the close button when setting the font. --- dlls/user32/msgbox.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 9328cd0..8b3cb4d 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -88,7 +88,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* set button font */ for (i = IDOK; i <= IDCONTINUE; i++) /* no close button */ - if (i != IDCANCEL) + if (i != IDCLOSE) SendDlgItemMessageW (hwnd, i, WM_SETFONT, (WPARAM)hFont, 0); /* set text font */

1 0