October 2006 - Wine-commits

Andrew Talbot : wininet/tests: Cast-qual warning fix.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: c54a2480ec6cdd52738fa07f22610b874c733a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54a2480ec6cdd52738fa07f2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Oct 5 19:44:30 2006 +0100 wininet/tests: Cast-qual warning fix. --- dlls/wininet/tests/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b64ee8a..5a49a65 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -579,9 +579,9 @@ static void HttpSendRequestEx_test(void) int i; BOOL ret; - static const char szPostData[] = "mode=Test"; + static char szPostData[] = "mode=Test"; static const char szContentType[] = "Content-Type: application/x-www-form-urlencoded"; - + hSession = InternetOpen("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG,NULL,NULL,0); ok( hSession != NULL ,"Unable to open Internet session\n"); @@ -604,7 +604,7 @@ static void HttpSendRequestEx_test(void) BufferIn.lpcszHeader = szContentType; BufferIn.dwHeadersLength = sizeof(szContentType); BufferIn.dwHeadersTotal = sizeof(szContentType); - BufferIn.lpvBuffer = (LPVOID)szPostData; + BufferIn.lpvBuffer = szPostData; BufferIn.dwBufferLength = 3; BufferIn.dwBufferTotal = sizeof(szPostData)-1; BufferIn.dwOffsetLow = 0;

1 0

Roderick Colenbrander : x11drv: Fix building issue.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 8be92001e64f73174bcd7e330538d194203adcf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be92001e64f73174bcd7e330… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Oct 5 20:57:07 2006 +0200 x11drv: Fix building issue. --- dlls/opengl32/opengl_ext.h | 11 ----------- include/wine/wgl.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index a7fe233..c501399 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -41,17 +41,6 @@ #define CALLBACK __stdcall #define WINAPI __stdcall #define APIENTRY WINAPI -/* For compatibility with old Mesa headers */ -#ifndef GLX_SAMPLE_BUFFERS_ARB -# define GLX_SAMPLE_BUFFERS_ARB 100000 -#endif -#ifndef GLX_SAMPLES_ARB -# define GLX_SAMPLES_ARB 100001 -#endif -#ifndef GL_TEXTURE_CUBE_MAP -# define GL_TEXTURE_CUBE_MAP 0x8513 -#endif - /* X11 locking */ extern void (*wine_tsx11_lock_ptr)(void); diff --git a/include/wine/wgl.h b/include/wine/wgl.h index 66fb1b0..e191407 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -20,6 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* For compatibility with old Mesa headers */ +#ifndef GLX_SAMPLE_BUFFERS_ARB +# define GLX_SAMPLE_BUFFERS_ARB 100000 +#endif +#ifndef GLX_SAMPLES_ARB +# define GLX_SAMPLES_ARB 100001 +#endif +#ifndef GL_TEXTURE_CUBE_MAP +# define GL_TEXTURE_CUBE_MAP 0x8513 +#endif + #define HPBUFFERARB void * #define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000

1 0

Stefan Dösinger : wined3d: Correctly name a variable.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 67436f9dbd6a0f987d35a0ff987f2cc257a870a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67436f9dbd6a0f987d35a0ff9… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Oct 5 20:04:07 2006 +0200 wined3d: Correctly name a variable. --- dlls/wined3d/surface.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a752665..19bbd98 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1796,7 +1796,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp GLenum format, internal, type; CONVERT_TYPES convert; int bpp; - int pitch; + int width; BYTE *mem; if (This->Flags & SFLAG_INTEXTURE) { @@ -1879,21 +1879,21 @@ static HRESULT WINAPI IWineD3DSurfaceImp d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp); - /* The pitch is in 'length' not in bytes */ + /* The width is in 'length' not in bytes */ if (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET) - pitch = This->currentDesc.Width; + width = This->currentDesc.Width; else - pitch = This->pow2Width; + width = This->pow2Width; if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { int height = This->glRect.bottom - This->glRect.top; - mem = HeapAlloc(GetProcessHeap(), 0, pitch * height * bpp); + mem = HeapAlloc(GetProcessHeap(), 0, width * height * bpp); if(!mem) { - ERR("Out of memory %d, %d!\n", pitch, height); + ERR("Out of memory %d, %d!\n", width, height); return WINED3DERR_OUTOFVIDEOMEMORY; } - d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch * height, convert, This); + d3dfmt_convert_surface(This->resource.allocatedMemory, mem, width * height, convert, This); This->Flags |= SFLAG_CONVERTED; } else if (This->resource.format == WINED3DFMT_P8 && GL_SUPPORT(EXT_PALETTED_TEXTURE)) { @@ -1906,7 +1906,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp } /* Make sure the correct pitch is used */ - glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch); + glPixelStorei(GL_UNPACK_ROW_LENGTH, width); if (NP2_REPACK == wined3d_settings.nonpower2_mode && (This->Flags & SFLAG_NONPOW2) && !(This->Flags & SFLAG_OVERSIZE)) { TRACE("non power of two support\n");

1 0

Hans Leidekker : Don't use utf-8 in rc files.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 385a8da4e4b4a179f3a17c1b0dc676945adbc7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=385a8da4e4b4a179f3a17c1b0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 5 21:27:38 2006 +0200 Don't use utf-8 in rc files. --- dlls/comctl32/comctl_Nl.rc | 2 +- dlls/mpr/mpr_Pt.rc | 4 ++-- dlls/oledlg/oledlg_Nl.rc | 2 +- dlls/shlwapi/shlwapi_Pt.rc | 4 ++-- dlls/wineps.drv/wps_Nl.rc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/comctl_Nl.rc b/dlls/comctl32/comctl_Nl.rc index 06b23be..16b913f 100644 --- a/dlls/comctl32/comctl_Nl.rc +++ b/dlls/comctl32/comctl_Nl.rc @@ -40,7 +40,7 @@ FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< V&orige", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&Volgende >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Beëindigen", IDC_FINISH_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Be�indigen", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Annuleren", IDCANCEL,178,138,50,14 PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN diff --git a/dlls/mpr/mpr_Pt.rc b/dlls/mpr/mpr_Pt.rc index 74523d1..da2350a 100644 --- a/dlls/mpr/mpr_Pt.rc +++ b/dlls/mpr/mpr_Pt.rc @@ -30,10 +30,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPT CAPTION "Entre a senha da rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, entre como o nome de usuário e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Por favor, entre como o nome de usu�rio e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Usuário", -1, 40, 66, 50, 10 + LTEXT "Usu�rio", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 diff --git a/dlls/oledlg/oledlg_Nl.rc b/dlls/oledlg/oledlg_Nl.rc index afd7376..174ac04 100644 --- a/dlls/oledlg/oledlg_Nl.rc +++ b/dlls/oledlg/oledlg_Nl.rc @@ -33,7 +33,7 @@ BEGIN GROUPBOX "Resultaat",IDC_RESULT,7,103,208,41 CONTROL "Nieuw",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "Creëren",IDC_CREATECONTROL,"Button", + CONTROL "Cre�ren",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 CONTROL "Bestand gebruiken",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 diff --git a/dlls/shlwapi/shlwapi_Pt.rc b/dlls/shlwapi/shlwapi_Pt.rc index c11693a..30f4961 100644 --- a/dlls/shlwapi/shlwapi_Pt.rc +++ b/dlls/shlwapi/shlwapi_Pt.rc @@ -27,11 +27,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Não &me mostre essa mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "N�o &me mostre essa mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Não" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&N�o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE diff --git a/dlls/wineps.drv/wps_Nl.rc b/dlls/wineps.drv/wps_Nl.rc index 9ba38ea..152ed4a 100644 --- a/dlls/wineps.drv/wps_Nl.rc +++ b/dlls/wineps.drv/wps_Nl.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Papier&formaat:", -1, 10, 6, 100, 8 LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP - GROUPBOX "Oriëntatie", -1, 10, 80, 200, 50 + GROUPBOX "Ori�ntatie", -1, 10, 80, 200, 50 CONTROL "&Portret", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 CONTROL "&Landschap", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON,

1 0

Francois Gouget : French rc files must be encoded in iso-8859-1, not utf-8.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 7295af09157715c0dc0c7c949b3abff5b01e0d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7295af09157715c0dc0c7c949… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 17:57:18 2006 +0200 French rc files must be encoded in iso-8859-1, not utf-8. --- dlls/crypt32/crypt32_Fr.rc | 36 ++++++++-------- dlls/gphoto2.ds/gphoto2_Fr.rc | 6 +-- dlls/hhctrl.ocx/Fr.rc | 4 +- dlls/winspool.drv/Fr.rc | 6 +-- programs/oleview/Fr.rc | 90 +++++++++++++++++++++-------------------- 5 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7295af09157715c0dc0c7…

1 0

Paul Chitescu : netapi: Stub for DsGetDcNameA.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: a0db724a5e41710bdf81c0e01c9f0b0a93d12d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0db724a5e41710bdf81c0e01… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Thu Oct 5 17:26:53 2006 +0300 netapi: Stub for DsGetDcNameA. --- dlls/netapi32/ds.c | 10 ++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/ds.c b/dlls/netapi32/ds.c index 1715257..067c468 100644 --- a/dlls/netapi32/ds.c +++ b/dlls/netapi32/ds.c @@ -43,6 +43,16 @@ DWORD WINAPI DsGetDcNameW(LPCWSTR Comput return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI DsGetDcNameA(LPCSTR ComputerName, LPCSTR AvoidDCName, + GUID* DomainGuid, LPCSTR SiteName, ULONG Flags, + PDOMAIN_CONTROLLER_INFOA *DomainControllerInfo) +{ + FIXME("(%s, %s, %s, %s, %08lx, %p): stub\n", debugstr_a(ComputerName), + debugstr_a(AvoidDCName), debugstr_guid(DomainGuid), + debugstr_a(SiteName), Flags, DomainControllerInfo); + return ERROR_CALL_NOT_IMPLEMENTED; +} + DWORD WINAPI DsGetSiteNameW(LPCWSTR ComputerName, LPWSTR *SiteName) { FIXME("(%s, %p): stub\n", debugstr_w(ComputerName), SiteName); diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index a4f46e2..52be477 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -3,7 +3,7 @@ @ stub DsDeregisterDnsHostRecords @ stub DsEnumerateDomainTrusts @ stub DsGetDcClose -@ stub DsGetDcNameA # (str str ptr str long ptr) +@ stdcall DsGetDcNameA(str str ptr str long ptr) @ stdcall DsGetDcNameW(wstr wstr ptr wstr long ptr) @ stub DsGetDcNext @ stub DsGetDcOpen

1 0

Dmitry Timoshkov : winex11.drv: Make all windows moveable by default.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: ac387bbe13549193046fce2734ff9e75ef1fffc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac387bbe13549193046fce273… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 5 23:16:36 2006 +0900 winex11.drv: Make all windows moveable by default. --- dlls/winex11.drv/window.c | 6 ++---- dlls/winex11.drv/winpos.c | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f540442..76fcf0a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -532,13 +532,11 @@ void X11DRV_set_wm_hints( Display *displ } mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; - mwm_hints.functions = 0; - if ((style & WS_CAPTION) == WS_CAPTION) mwm_hints.functions |= MWM_FUNC_MOVE; - if (style & WS_THICKFRAME) mwm_hints.functions |= MWM_FUNC_MOVE | MWM_FUNC_RESIZE; + mwm_hints.functions = MWM_FUNC_MOVE; + if (style & WS_THICKFRAME) mwm_hints.functions |= MWM_FUNC_RESIZE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; - if (ex_style & WS_EX_APPWINDOW) mwm_hints.functions |= MWM_FUNC_MOVE; mwm_hints.decorations = 0; if ((style & WS_CAPTION) == WS_CAPTION) { diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 3c45fff..a84bc5e 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -1537,6 +1537,8 @@ static void X11DRV_WMMoveResizeWindow( H XEvent xev; Display *display = thread_display(); + TRACE("hwnd %p, x %d, y %d, dir %d\n", hwnd, x, y, dir); + xev.xclient.type = ClientMessage; xev.xclient.window = X11DRV_get_whole_window(hwnd); xev.xclient.message_type = x11drv_atom(_NET_WM_MOVERESIZE); @@ -1594,6 +1596,9 @@ void X11DRV_SysCommandSizeMove( HWND hwn if (!(data = X11DRV_get_win_data( hwnd ))) return; + TRACE("hwnd %p (%smanaged), command %04x, hittest %ld, pos %ld,%ld\n", + hwnd, data->managed ? "" : "NOT ", syscommand, hittest, pt.x, pt.y); + /* if we are managed then we let the WM do all the work */ if (data->managed) {

1 0

Hans Leidekker : wldap32: Cast-qual warnings fix.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 906ca7058337a1e250f48477ef7530d6fe272914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=906ca7058337a1e250f48477e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 5 15:37:39 2006 +0200 wldap32: Cast-qual warnings fix. --- dlls/wldap32/bind.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 39bd221..0196d16 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -303,6 +303,7 @@ ULONG CDECL ldap_sasl_bindW( WLDAP32_LDA #ifdef HAVE_LDAP char *dnU, *mechanismU = NULL; LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL; + struct berval credU; ret = WLDAP32_LDAP_NO_MEMORY; @@ -327,7 +328,10 @@ #ifdef HAVE_LDAP if (!clientctrlsU) goto exit; } - ret = ldap_sasl_bind( ld, dnU, mechanismU, (struct berval *)cred, + credU.bv_len = cred->bv_len; + credU.bv_val = cred->bv_val; + + ret = ldap_sasl_bind( ld, dnU, mechanismU, &credU, serverctrlsU, clientctrlsU, message ); exit: @@ -419,6 +423,7 @@ ULONG CDECL ldap_sasl_bind_sW( WLDAP32_L #ifdef HAVE_LDAP char *dnU, *mechanismU = NULL; LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL; + struct berval credU; ret = WLDAP32_LDAP_NO_MEMORY; @@ -443,7 +448,10 @@ #ifdef HAVE_LDAP if (!clientctrlsU) goto exit; } - ret = ldap_sasl_bind_s( ld, dnU, mechanismU, (struct berval *)cred, + credU.bv_len = cred->bv_len; + credU.bv_val = cred->bv_val; + + ret = ldap_sasl_bind_s( ld, dnU, mechanismU, &credU, serverctrlsU, clientctrlsU, (struct berval **)serverdata ); exit:

1 0

Hans Leidekker : dnsapi: Cast-qual warnings fix.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: b85e3fe4ebde4dc9e59d955746fe2f70921c7d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85e3fe4ebde4dc9e59d95574… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 5 15:36:39 2006 +0200 dnsapi: Cast-qual warnings fix. --- dlls/dnsapi/ns_parse.c | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/dnsapi/ns_parse.c b/dlls/dnsapi/ns_parse.c index 9c386bc..9580b72 100644 --- a/dlls/dnsapi/ns_parse.c +++ b/dlls/dnsapi/ns_parse.c @@ -48,6 +48,24 @@ #else # define NS_PTR(ns_msg) ((ns_msg)->_ptr) #endif +#define DNS_NS_GET16(s, cp) do { \ + register const u_char *t_cp = (const u_char *)(cp); \ + (s) = ((u_int16_t)t_cp[0] << 8) \ + | ((u_int16_t)t_cp[1]) \ + ; \ + (cp) += NS_INT16SZ; \ +} while (0) + +#define DNS_NS_GET32(l, cp) do { \ + register const u_char *t_cp = (const u_char *)(cp); \ + (l) = ((u_int32_t)t_cp[0] << 24) \ + | ((u_int32_t)t_cp[1] << 16) \ + | ((u_int32_t)t_cp[2] << 8) \ + | ((u_int32_t)t_cp[3]) \ + ; \ + (cp) += NS_INT32SZ; \ +} while (0) + /* Public. */ static int @@ -65,7 +83,7 @@ dns_ns_skiprr(const u_char *ptr, const u if (ptr + NS_INT32SZ + NS_INT16SZ > eom) RETERR(EMSGSIZE); ptr += NS_INT32SZ/*TTL*/; - NS_GET16(rdlength, ptr); + DNS_NS_GET16(rdlength, ptr); ptr += rdlength/*RData*/; } } @@ -84,14 +102,14 @@ dns_ns_initparse(const u_char *msg, int handle->_eom = eom; if (msg + NS_INT16SZ > eom) RETERR(EMSGSIZE); - NS_GET16(handle->_id, msg); + DNS_NS_GET16(handle->_id, msg); if (msg + NS_INT16SZ > eom) RETERR(EMSGSIZE); - NS_GET16(handle->_flags, msg); + DNS_NS_GET16(handle->_flags, msg); for (i = 0; i < ns_s_max; i++) { if (msg + NS_INT16SZ > eom) RETERR(EMSGSIZE); - NS_GET16(handle->_counts[i], msg); + DNS_NS_GET16(handle->_counts[i], msg); } for (i = 0; i < ns_s_max; i++) if (handle->_counts[i] == 0) @@ -146,8 +164,8 @@ dns_ns_parserr(ns_msg *handle, ns_sect s NS_PTR(handle) += b; if (NS_PTR(handle) + NS_INT16SZ + NS_INT16SZ > handle->_eom) RETERR(EMSGSIZE); - NS_GET16(rr->type, NS_PTR(handle)); - NS_GET16(rr->rr_class, NS_PTR(handle)); + DNS_NS_GET16(rr->type, NS_PTR(handle)); + DNS_NS_GET16(rr->rr_class, NS_PTR(handle)); if (section == ns_s_qd) { rr->ttl = 0; rr->rdlength = 0; @@ -155,8 +173,8 @@ dns_ns_parserr(ns_msg *handle, ns_sect s } else { if (NS_PTR(handle) + NS_INT32SZ + NS_INT16SZ > handle->_eom) RETERR(EMSGSIZE); - NS_GET32(rr->ttl, NS_PTR(handle)); - NS_GET16(rr->rdlength, NS_PTR(handle)); + DNS_NS_GET32(rr->ttl, NS_PTR(handle)); + DNS_NS_GET16(rr->rdlength, NS_PTR(handle)); if (NS_PTR(handle) + rr->rdlength > handle->_eom) RETERR(EMSGSIZE); rr->rdata = NS_PTR(handle);

1 0

Hans Leidekker : mscms: Cast-qual warnings fix.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 8af7133dfc70595dca6a486950a5cb3c19bfe8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af7133dfc70595dca6a48695… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 5 15:36:13 2006 +0200 mscms: Cast-qual warnings fix. --- dlls/mscms/profile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index f28f5ae..0b1b437 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -615,7 +615,7 @@ BOOL WINAPI EnumColorProfilesA( PCSTR ma PROFILEHEADER header; WIN32_FIND_DATAA data; ENUMTYPEW recordW; - WCHAR *fileW = NULL; + WCHAR *fileW = NULL, *deviceW = NULL; HANDLE find; TRACE( "( %p, %p, %p, %p, %p )\n", machine, record, buffer, size, number ); @@ -643,8 +643,8 @@ BOOL WINAPI EnumColorProfilesA( PCSTR ma memcpy( &recordW, record, sizeof(ENUMTYPEA) ); if (record->pDeviceName) { - recordW.pDeviceName = MSCMS_strdupW( record->pDeviceName ); - if (!recordW.pDeviceName) goto exit; + deviceW = MSCMS_strdupW( record->pDeviceName ); + if (!(recordW.pDeviceName = deviceW)) goto exit; } fileW = MSCMS_strdupW( data.cFileName ); @@ -730,7 +730,7 @@ exit: for (i = 0; i < count; i++) HeapFree( GetProcessHeap(), 0, profiles[i] ); HeapFree( GetProcessHeap(), 0, profiles ); - HeapFree( GetProcessHeap(), 0, (WCHAR *)recordW.pDeviceName ); + HeapFree( GetProcessHeap(), 0, deviceW ); HeapFree( GetProcessHeap(), 0, fileW ); FindClose( find );

1 0