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

Dmitry Timoshkov : gdi32: Scale default GUI fonts to match screen resolution changes.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: 705a0f023846fc113413a30d097b80860bd3d40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=705a0f023846fc113413a30d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 17 19:02:25 2013 +0900 gdi32: Scale default GUI fonts to match screen resolution changes. --- dlls/gdi32/gdiobj.c | 49 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/font.c | 7 +++++- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 5375049..de64474 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -597,6 +597,49 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) return entry != NULL; } +/****************************************************************************** + * get_dpi (internal) + * + * get the dpi from the registry + */ +static int get_dpi( void ) +{ + static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; + static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; + static int dpi = -1; + HKEY hkey; + + if (dpi != -1) return dpi; + + if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) + { + DWORD type, size; + int new_dpi; + + size = sizeof(new_dpi); + if (RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS) + { + if (type == REG_DWORD && new_dpi != 0) + dpi = new_dpi; + } + RegCloseKey(hkey); + } + if (dpi <= 0) dpi = 96; + return dpi; +} + + +static HFONT create_scaled_font( const LOGFONTW *deffont ) +{ + LOGFONTW lf; + LONG height; + + lf = *deffont; + height = abs(lf.lfHeight) * get_dpi() / 96; + lf.lfHeight = deffont->lfHeight < 0 ? -height : height; + + return CreateFontIndirectW( &lf ); +} /*********************************************************************** * DllMain @@ -636,10 +679,10 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) /* language-dependent stock fonts */ deffonts = get_default_fonts(get_default_charset()); - stock_objects[SYSTEM_FONT] = CreateFontIndirectW( &deffonts->SystemFont ); - stock_objects[DEVICE_DEFAULT_FONT] = CreateFontIndirectW( &deffonts->DeviceDefaultFont ); + stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); + stock_objects[DEVICE_DEFAULT_FONT] = create_scaled_font( &deffonts->DeviceDefaultFont ); stock_objects[SYSTEM_FIXED_FONT] = CreateFontIndirectW( &deffonts->SystemFixedFont ); - stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &deffonts->DefaultGuiFont ); + stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush ); stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 2802f0e..9563da9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5012,7 +5012,12 @@ static void test_stock_fonts(void) } /* FIXME: Remove once Wine is fixed */ - if (td[i][j].dpi != 96) todo_wine + if (td[i][j].dpi != 96 && + /* MS Sans Serif for 120 dpi and higher should include 12 pixel bitmap set */ + ((!strcmp(td[i][j].face_name, "MS Sans Serif") && td[i][j].height == 12) || + /* System for 120 dpi and higher should include 20 pixel bitmap set */ + (!strcmp(td[i][j].face_name, "System") && td[i][j].height > 16))) + todo_wine ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height); else ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height);

1 0

André Hentschel : include: Check for getopt_long_only instead of getopt_long.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: bd5422406d37a039e6eeb4fb9837825779f6024c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5422406d37a039e6eeb4fb9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 16 17:07:55 2013 +0200 include: Check for getopt_long_only instead of getopt_long. --- include/wine/port.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 76a0b3e..09dbf61 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -229,7 +229,7 @@ static inline float __port_nan(void) int fstatvfs( int fd, struct statvfs *buf ); #endif -#ifndef HAVE_GETOPT_LONG +#ifndef HAVE_GETOPT_LONG_ONLY extern char *optarg; extern int optind; extern int opterr; @@ -252,7 +252,7 @@ extern int getopt_long (int ___argc, char *const *___argv, extern int getopt_long_only (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind); -#endif /* HAVE_GETOPT_LONG */ +#endif /* HAVE_GETOPT_LONG_ONLY */ #ifndef HAVE_FFS int ffs( int x );

1 0

Alexandre Julliard : user32: Make the default non-client metrics scalable with the resolution.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: a657e5f6efa160110867d3a19ed886a9b40ceb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a657e5f6efa160110867d3a19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 14:35:47 2013 +0200 user32: Make the default non-client metrics scalable with the resolution. --- dlls/user32/sysparams.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 175753c..7c05d00 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1181,18 +1181,18 @@ static BOOL_ENTRY_MIRROR( ICONTITLEWRAP, TRUE ); static YESNO_ENTRY( BEEP, TRUE ); -static TWIPS_ENTRY( BORDER, 1 ); -static TWIPS_ENTRY( CAPTIONHEIGHT, 18 ); -static TWIPS_ENTRY( CAPTIONWIDTH, 18 ); -static TWIPS_ENTRY( ICONHORIZONTALSPACING, 75 ); -static TWIPS_ENTRY( ICONVERTICALSPACING, 75 ); -static TWIPS_ENTRY( MENUHEIGHT, 18 ); -static TWIPS_ENTRY( MENUWIDTH, 18 ); +static TWIPS_ENTRY( BORDER, -15 ); +static TWIPS_ENTRY( CAPTIONHEIGHT, -270 ); +static TWIPS_ENTRY( CAPTIONWIDTH, -270 ); +static TWIPS_ENTRY( ICONHORIZONTALSPACING, -1125 ); +static TWIPS_ENTRY( ICONVERTICALSPACING, -1125 ); +static TWIPS_ENTRY( MENUHEIGHT, -270 ); +static TWIPS_ENTRY( MENUWIDTH, -270 ); static TWIPS_ENTRY( PADDEDBORDERWIDTH, 0 ); -static TWIPS_ENTRY( SCROLLHEIGHT, 16 ); -static TWIPS_ENTRY( SCROLLWIDTH, 16 ); -static TWIPS_ENTRY( SMCAPTIONHEIGHT, 15 ); -static TWIPS_ENTRY( SMCAPTIONWIDTH, 13 ); +static TWIPS_ENTRY( SCROLLHEIGHT, -240 ); +static TWIPS_ENTRY( SCROLLWIDTH, -240 ); +static TWIPS_ENTRY( SMCAPTIONHEIGHT, -225 ); +static TWIPS_ENTRY( SMCAPTIONWIDTH, -225 ); static DWORD_ENTRY( ACTIVEWINDOWTRACKING, 0 ); static DWORD_ENTRY( ACTIVEWNDTRKTIMEOUT, 0 );

1 0

Alexandre Julliard : windowscodecs/tests: Pass the correct constant to IWICImagingFactory_CreateBitmapFromHBITMAP.
by Alexandre Julliard June 17, 2013

June 17, 2013

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

Alistair Leslie-Hughes : oledb32: Properties aren't case sensitive.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: 57d0efa45994d8e8cb35720e3c76e1cfac6be420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d0efa45994d8e8cb35720e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 21:48:14 2013 +1000 oledb32: Properties aren't case sensitive. --- dlls/oledb32/datainit.c | 2 +- dlls/oledb32/tests/database.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 13d9f55..58bd812 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -368,7 +368,7 @@ static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) n = (min+max)/2; - r = strcmpW(dbproperties[n].name, name); + r = strcmpiW(dbproperties[n].name, name); if (!r) break; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 518bba7..216adc6 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -97,6 +97,7 @@ static void test_database(void) 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', 'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0}; static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -111,6 +112,7 @@ static void test_database(void) test_GetDataSource(NULL); test_GetDataSource(initstring_jet); test_GetDataSource(initstring_default); + test_GetDataSource(initstring_lower); } START_TEST(database)

1 0

Alexandre Julliard : user32: Check the correct id for the close button when setting the font.
by Alexandre Julliard June 17, 2013

June 17, 2013

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

Alexandre Julliard : inetcomm: Only set the command type when the command expects a reply.
by Alexandre Julliard June 17, 2013

June 17, 2013

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 : widl: Avoid short printf formats with int variables.
by Alexandre Julliard June 17, 2013

June 17, 2013

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

André Hentschel : winemaker: Use utf-8 for stdout.
by Alexandre Julliard June 17, 2013

June 17, 2013

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

André Hentschel : wineoss.drv: Don' t use autoheader styled define.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: b5bb995e5cca9d619a9ac936d947c1ee7427b174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5bb995e5cca9d619a9ac936d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 16 20:54:36 2013 +0200 wineoss.drv: Don't use autoheader styled define. --- dlls/wineoss.drv/midi.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index bd013e1..5ab5b0d 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -74,10 +74,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); #ifdef SNDCTL_SEQ_NRMIDIS -#define HAVE_OSS_MIDI -#endif - -#ifdef HAVE_OSS_MIDI typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ @@ -1642,7 +1638,7 @@ static DWORD modReset(WORD wDevID) return MMSYSERR_NOERROR; } -#endif /* HAVE_OSS_MIDI */ +#endif /* SNDCTL_SEQ_NRMIDIS */ /*======================================================================* * MIDI entry points * @@ -1657,7 +1653,7 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef HAVE_OSS_MIDI +#ifdef SNDCTL_SEQ_NRMIDIS case DRVM_INIT: return OSS_MidiInit(); case DRVM_EXIT: @@ -1707,7 +1703,7 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef HAVE_OSS_MIDI +#ifdef SNDCTL_SEQ_NRMIDIS case DRVM_INIT: return OSS_MidiInit(); case DRVM_EXIT:

1 0