July 2008 - Wine-Commits - list.winehq.org

James Hawkins : comctl32: Explicity set the number of tics before testing tic placement.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 83004cdd1e2197e42f14b4409720fe4300b094b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83004cdd1e2197e42f14b4409… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Jul 11 19:37:21 2008 -0500 comctl32: Explicity set the number of tics before testing tic placement. --- dlls/comctl32/tests/trackbar.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 13f56fd..41f866e 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -331,10 +331,10 @@ static const struct message parent_thumb_length_test_seq[] = { static const struct message tic_placement_test_seq[] = { { TBM_GETPTICS, sent}, { TBM_GETTIC, sent|wparam, 0}, + { TBM_GETTIC, sent|wparam, 2}, { TBM_GETTIC, sent|wparam, 4}, - { TBM_GETTIC, sent|wparam, 11}, { TBM_GETTICPOS, sent|wparam, 0}, - { TBM_GETTICPOS, sent|wparam, 4}, + { TBM_GETTICPOS, sent|wparam, 2}, {0} }; @@ -799,34 +799,37 @@ static void test_tic_settings(HWND hWndTrackbar){ static void test_tic_placement(HWND hWndTrackbar){ int r; DWORD *rPTics; + DWORD numtics; + + SendMessage(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(1, 6)); + SendMessage(hWndTrackbar, TBM_SETTICFREQ, 1, 0); + + numtics = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0); + ok(numtics == 6, "Expected 6, got %d\n", numtics); flush_sequences(sequences, NUM_MSG_SEQUENCE); /* test TBM_GETPTICS */ rPTics = (DWORD *) SendMessage(hWndTrackbar, TBM_GETPTICS, 0,0); - todo_wine{ - expect(1, rPTics[0]); - expect(2, rPTics[1]); - expect(3, rPTics[2]); - expect(4, rPTics[3]); - } + expect(2, rPTics[0]); + expect(3, rPTics[1]); + expect(4, rPTics[2]); + expect(5, rPTics[3]); /* test TBM_GETTIC */ r = SendMessage(hWndTrackbar, TBM_GETTIC, 0,0); + expect(2, r); + r = SendMessage(hWndTrackbar, TBM_GETTIC, 2,0); + expect(4, r); + r = SendMessage(hWndTrackbar, TBM_GETTIC, 4,0); todo_wine{ - expect(1, r); - r = SendMessage(hWndTrackbar, TBM_GETTIC, 4,0); - expect(5, r); + expect(-1, r); } - r = SendMessage(hWndTrackbar, TBM_GETTIC, 11,0); - expect(-1, r); /* test TBM_GETTICPIC */ r = SendMessage(hWndTrackbar, TBM_GETTICPOS, 0, 0); - todo_wine{ - ok(r > 0, "Expected r > 0, got %d\n", r); - r = SendMessage(hWndTrackbar, TBM_GETTICPOS, 4, 0); - ok(r > 0, "Expected r > 0, got %d\n", r); - } + ok(r > 0, "Expected r > 0, got %d\n", r); + r = SendMessage(hWndTrackbar, TBM_GETTICPOS, 2, 0); + ok(r > 0, "Expected r > 0, got %d\n", r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, tic_placement_test_seq, "get tic placement test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent get tic placement test sequence", FALSE);

1 0

Andrew Talbot : ws2_32: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: a42a61eee17465275dbac37b4369db72c115d2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42a61eee17465275dbac37b4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 12 20:37:39 2008 +0100 ws2_32: Remove unneeded address-of operators from array names. --- dlls/ws2_32/socket.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 53478d6..6624c96 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1036,7 +1036,7 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws win->sin_family = WS_AF_INET; win->sin_port = uin->sin_port; memcpy(&win->sin_addr,&uin->sin_addr,4); /* 4 bytes = 32 address bits */ - memset(&win->sin_zero, 0, 8); /* Make sure the null padding is null */ + memset(win->sin_zero, 0, 8); /* Make sure the null padding is null */ *wsaddrlen = sizeof(struct WS_sockaddr_in); return 0; } @@ -1434,7 +1434,7 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) if (name->sa_family == WS_AF_INET) { struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; - if (memcmp(&in4->sin_addr, &magic_loopback_addr, 4) == 0) + if (memcmp(&in4->sin_addr, magic_loopback_addr, 4) == 0) { /* Trying to bind to the default host interface, using * INADDR_ANY instead*/ @@ -1505,7 +1505,7 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (name->sa_family == WS_AF_INET) { struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; - if (memcmp(&in4->sin_addr, &magic_loopback_addr, 4) == 0) + if (memcmp(&in4->sin_addr, magic_loopback_addr, 4) == 0) { /* Trying to connect to magic replace-loopback address, * assuming we really want to connect to localhost */ @@ -1883,8 +1883,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, WS_getsockname(s, (struct WS_sockaddr*)&addr, &namelen); data = (IPX_ADDRESS_DATA*)optval; - memcpy(data->nodenum,&addr.sa_nodenum,sizeof(data->nodenum)); - memcpy(data->netnum,&addr.sa_netnum,sizeof(data->netnum)); + memcpy(data->nodenum,addr.sa_nodenum,sizeof(data->nodenum)); + memcpy(data->netnum,addr.sa_netnum,sizeof(data->netnum)); data->adapternum = 0; data->wan = FALSE; /* We are not on a wan for now .. */ data->status = FALSE; /* Since we are not on a wan, the wan link isn't up */

1 0

Andrew Talbot : wintrust: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 015321910d558314b7f707be7d6bda915d3da1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=015321910d558314b7f707be7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 12 20:37:34 2008 +0100 wintrust: Remove unneeded address-of operators from array names. --- dlls/wintrust/asn.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 2b0bde1..09285bc 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -187,7 +187,7 @@ BOOL WINAPI WVTAsn1SpcLinkEncode(DWORD dwCertEncodingType, { DWORD classIdLenBytes, dataLenBytes, dataLen; CRYPT_DATA_BLOB classId = { sizeof(link->u.Moniker.ClassId), - (BYTE *)&link->u.Moniker.ClassId }; + (BYTE *)link->u.Moniker.ClassId }; CRYPT_EncodeLen(classId.cbData, NULL, &classIdLenBytes); CRYPT_EncodeLen(link->u.Moniker.SerializedData.cbData, NULL, @@ -954,7 +954,7 @@ static BOOL WINAPI CRYPT_AsnDecodeSPCLinkInternal(DWORD dwCertEncodingType, */ link->u.Moniker.SerializedData.pbData = (BYTE *)link->u.pwszFile; - memcpy(&link->u.Moniker.ClassId, classId.pbData, + memcpy(link->u.Moniker.ClassId, classId.pbData, classId.cbData); memcpy(link->u.Moniker.SerializedData.pbData, data.pbData, data.cbData);

1 0

Andrew Talbot : winex11.drv: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 9b5d26ed8b7b581891d004fb13331794cf8716d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5d26ed8b7b581891d004fb1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 12 20:37:27 2008 +0100 winex11.drv: Remove unneeded address-of operators from array names. --- dlls/winex11.drv/wintab.c | 14 +++++++------- dlls/winex11.drv/xrender.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 4a77c1b..5793e2c 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -1129,7 +1129,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) sizeof(LOGCONTEXTW)); break; case CTX_NAME: - rc = CopyTabletData(lpOutput, &gSysContext.lcName, + rc = CopyTabletData(lpOutput, gSysContext.lcName, (strlenW(gSysContext.lcName)+1) * sizeof(WCHAR)); break; case CTX_OPTIONS: @@ -1293,7 +1293,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) switch (nIndex) { case CSR_NAME: - rc = CopyTabletData(lpOutput, &tgtcursor->NAME, + rc = CopyTabletData(lpOutput, tgtcursor->NAME, (strlenW(tgtcursor->NAME)+1) * sizeof(WCHAR)); break; case CSR_ACTIVE: @@ -1318,15 +1318,15 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) tgtcursor->cchBTNNAMES*sizeof(WCHAR)); break; case CSR_BUTTONMAP: - rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONMAP, + rc = CopyTabletData(lpOutput,tgtcursor->BUTTONMAP, sizeof(BYTE)*32); break; case CSR_SYSBTNMAP: - rc = CopyTabletData(lpOutput,&tgtcursor->SYSBTNMAP, + rc = CopyTabletData(lpOutput,tgtcursor->SYSBTNMAP, sizeof(BYTE)*32); break; case CSR_NPBTNMARKS: - rc = CopyTabletData(lpOutput,&tgtcursor->NPBTNMARKS, + rc = CopyTabletData(lpOutput,tgtcursor->NPBTNMARKS, sizeof(UINT)*2); break; case CSR_NPBUTTON: @@ -1342,7 +1342,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) sizeof(BYTE)); break; case CSR_TPBTNMARKS: - rc = CopyTabletData(lpOutput,&tgtcursor->TPBTNMARKS, + rc = CopyTabletData(lpOutput,tgtcursor->TPBTNMARKS, sizeof(UINT)*2); break; case CSR_TPRESPONSE: @@ -1458,7 +1458,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) */ break; case DVC_ORIENTATION: - rc = CopyTabletData(lpOutput,&gSysDevice.ORIENTATION, + rc = CopyTabletData(lpOutput,gSysDevice.ORIENTATION, sizeof(AXIS)*3); break; case DVC_ROTATION: diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 554ce25..c7dac70 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -502,7 +502,7 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz) hash ^= plfsz->devsize.cy; for(i = 0, ptr = (DWORD*)&plfsz->lf; i < 7; i++, ptr++) hash ^= *ptr; - for(i = 0, ptr = (DWORD*)&plfsz->lf.lfFaceName; i < LF_FACESIZE/2; i++, ptr++) { + for(i = 0, ptr = (DWORD*)plfsz->lf.lfFaceName; i < LF_FACESIZE/2; i++, ptr++) { WCHAR *pwc = (WCHAR *)ptr; if(!*pwc) break; hash ^= *ptr;

1 0

Andrew Talbot : wininet: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 6a26bccb8efa6367142af7b63c078ed63c5206d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a26bccb8efa6367142af7b63… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 12 20:37:31 2008 +0100 wininet: Remove unneeded address-of operators from array names. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ce5da56..b054765 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2715,7 +2715,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe URL_COMPONENTSW components; ZeroMemory(&components,sizeof(URL_COMPONENTSW)); - components.lpszHostName = (LPWSTR)&hostW; + components.lpszHostName = (LPWSTR)hostW; components.dwHostNameLength = 1024; if (!InternetCrackUrlW(lpszUrl,0,0,&components)) @@ -3427,7 +3427,7 @@ static LPCWSTR INTERNET_GetSchemeString(INTERNET_SCHEME scheme) index = scheme - INTERNET_SCHEME_FIRST; if (index >= sizeof(url_schemes)/sizeof(url_schemes[0])) return NULL; - return (LPCWSTR)&url_schemes[index]; + return (LPCWSTR)url_schemes[index]; } /* we can calculate using ansi strings because we're just

1 0

Andrew Talbot : winejoystick.drv: Remove unneeded address-of operator from array name.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 1fd750cf314bea179ee181737c196061c272aa40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd750cf314bea179ee181737… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 12 20:37:24 2008 +0100 winejoystick.drv: Remove unneeded address-of operator from array name. --- dlls/winejoystick.drv/joystick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index ac088da..2d3e514 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -207,7 +207,7 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', ioctl(dev, JSIOCGAXES, &nrOfAxes); ioctl(dev, JSIOCGBUTTONS, &nrOfButtons); ioctl(dev, JSIOCGVERSION, &driverVersion); - ioctl(dev, JSIOCGNAME(sizeof(identString)), &identString); + ioctl(dev, JSIOCGNAME(sizeof(identString)), identString); TRACE("Driver: 0x%06x, Name: %s, #Axes: %d, #Buttons: %d\n", driverVersion, identString, nrOfAxes, nrOfButtons); lpCaps->wMid = MM_MICROSOFT;

1 0

Andrew Talbot : wined3d: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 0064976d543b0e2b7f5f2ab7edc891f81fd8221c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0064976d543b0e2b7f5f2ab7e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 21:58:34 2008 +0100 wined3d: Remove unneeded address-of operators from array names. --- dlls/wined3d/baseshader.c | 6 +++--- dlls/wined3d/directx.c | 2 +- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/surface_base.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 57fbf62..3fcbc88 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -289,7 +289,7 @@ HRESULT shader_get_registers_used( local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); if (!lconst) return E_OUTOFMEMORY; lconst->idx = *pToken & WINED3DSP_REGNUM_MASK; - memcpy(&lconst->value, pToken + 1, 4 * sizeof(DWORD)); + memcpy(lconst->value, pToken + 1, 4 * sizeof(DWORD)); /* In pixel shader 1.X shaders, the constants are clamped between [-1;1] */ if(WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) == 1 && pshader) { @@ -312,7 +312,7 @@ HRESULT shader_get_registers_used( local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); if (!lconst) return E_OUTOFMEMORY; lconst->idx = *pToken & WINED3DSP_REGNUM_MASK; - memcpy(&lconst->value, pToken + 1, 4 * sizeof(DWORD)); + memcpy(lconst->value, pToken + 1, 4 * sizeof(DWORD)); list_add_head(&This->baseShader.constantsI, &lconst->entry); pToken += curOpcode->num_params; @@ -321,7 +321,7 @@ HRESULT shader_get_registers_used( local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); if (!lconst) return E_OUTOFMEMORY; lconst->idx = *pToken & WINED3DSP_REGNUM_MASK; - memcpy(&lconst->value, pToken + 1, 1 * sizeof(DWORD)); + memcpy(lconst->value, pToken + 1, 1 * sizeof(DWORD)); list_add_head(&This->baseShader.constantsB, &lconst->entry); pToken += curOpcode->num_params; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4b38291..062663a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -697,7 +697,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { * Initialize openGL extension related variables * with Default values */ - memset(&gl_info->supported, 0, sizeof(gl_info->supported)); + memset(gl_info->supported, 0, sizeof(gl_info->supported)); gl_info->max_buffers = 1; gl_info->max_textures = 1; gl_info->max_texture_stages = 1; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a7b20ee..e8ff6c1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1046,10 +1046,10 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat This->blockType = WINED3DSBT_INIT; /* Set some of the defaults for lights, transforms etc */ - memcpy(&This->transforms[WINED3DTS_PROJECTION], &identity, sizeof(identity)); - memcpy(&This->transforms[WINED3DTS_VIEW], &identity, sizeof(identity)); + memcpy(&This->transforms[WINED3DTS_PROJECTION], identity, sizeof(identity)); + memcpy(&This->transforms[WINED3DTS_VIEW], identity, sizeof(identity)); for (i = 0; i < 256; ++i) { - memcpy(&This->transforms[WINED3DTS_WORLDMATRIX(i)], &identity, sizeof(identity)); + memcpy(&This->transforms[WINED3DTS_WORLDMATRIX(i)], identity, sizeof(identity)); } TRACE("Render states\n"); @@ -1193,7 +1193,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat /* Texture Stage States - Put directly into state block, we will call function below */ for (i = 0; i < MAX_TEXTURES; i++) { TRACE("Setting up default texture states for texture Stage %d\n", i); - memcpy(&This->transforms[WINED3DTS_TEXTURE0 + i], &identity, sizeof(identity)); + memcpy(&This->transforms[WINED3DTS_TEXTURE0 + i], identity, sizeof(identity)); This->textureState[i][WINED3DTSS_COLOROP ] = (i==0)? WINED3DTOP_MODULATE : WINED3DTOP_DISABLE; This->textureState[i][WINED3DTSS_COLORARG1 ] = WINED3DTA_TEXTURE; This->textureState[i][WINED3DTSS_COLORARG2 ] = WINED3DTA_CURRENT; diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 183cd2b..57809e1 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -544,7 +544,7 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface) { b_info->bmiHeader.biClrImportant = 0; /* Get the bit masks */ - masks = (DWORD *) &(b_info->bmiColors); + masks = (DWORD *)b_info->bmiColors; switch (This->resource.format) { case WINED3DFMT_R8G8B8: usage = DIB_RGB_COLORS;

1 0

Andrew Talbot : winedos: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 9c6b1fee3859784b6595ec3a0cf9e25980fa6fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6b1fee3859784b6595ec3a0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 21:58:38 2008 +0100 winedos: Remove unneeded address-of operators from array names. --- dlls/winedos/int10.c | 2 +- dlls/winedos/vga.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index a056cb6..94ea6ff 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -548,7 +548,7 @@ static BOOL INT10_FillModeInformation( struct _ModeInfoBlock *mib, WORD mode ) mib->MaxPixelClock = 0; /* FIXME */ /* 66 - BYTE[190]: reserved, set to zero */ - memset( &mib->Reserved4, 0, 190 ); + memset( mib->Reserved4, 0, 190 ); return TRUE; } diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 26618a2..fd52689 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -563,7 +563,7 @@ void VGA_Set16Palette(char *Table) int c; if (!lpddraw) return; /* return if we're in text only mode */ - memcpy( Table, &vga_16_palette, 17 ); /* copy the entries into the table */ + memcpy( Table, vga_16_palette, 17 ); /* copy the entries into the table */ for (c=0; c<17; c++) { /* 17 entries */ pal= &vga_def64_palette[(int)vga_16_palette[c]]; /* get color */ @@ -577,7 +577,7 @@ void VGA_Get16Palette(char *Table) { if (!lpddraw) return; /* return if we're in text only mode */ - memcpy( &vga_16_palette, Table, 17 ); /* copy the entries into the table */ + memcpy( vga_16_palette, Table, 17 ); /* copy the entries into the table */ } void VGA_SetQuadPalette(RGBQUAD*color,int start,int len)

1 0

Andrew Talbot : user32: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: afc95d4ac3fc1afd0289a924c6a48f18b4d38274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc95d4ac3fc1afd0289a924c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 21:58:31 2008 +0100 user32: Remove unneeded address-of operators from array names. --- dlls/user32/exticon.c | 2 +- dlls/user32/nonclient.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 3d28f4c..41f0f14 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -776,7 +776,7 @@ UINT WINAPI PrivateExtractIconExW ( cxsmicon = GetSystemMetrics(SM_CXSMICON); cysmicon = GetSystemMetrics(SM_CYSMICON); - ret = ICO_ExtractIconExW(lpwstrFile, (HICON*) &hIcon, nIndex, 2, cxicon | (cxsmicon<<16), + ret = ICO_ExtractIconExW(lpwstrFile, (HICON*)hIcon, nIndex, 2, cxicon | (cxsmicon<<16), cyicon | (cysmicon<<16), NULL, LR_DEFAULTCOLOR); *phIconLarge = hIcon[0]; *phIconSmall = hIcon[1]; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index b11f474..3fa870e 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1648,7 +1648,7 @@ BOOL WINAPI GetTitleBarInfo(HWND hwnd, PTITLEBARINFO tbi) { tbi->rcTitleBar.left += GetSystemMetrics(SM_CXSIZE); } - ZeroMemory(&tbi->rgstate, sizeof(tbi->rgstate)); + ZeroMemory(tbi->rgstate, sizeof(tbi->rgstate)); /* Does the title bar always have STATE_SYSTEM_FOCUSABLE? * Under XP it seems to */

1 0

Andrew Talbot : shlwapi: Remove unneeded address-of operator from array name.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: dd0a22420ac8a400a398502d75b083b249c4101a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0a22420ac8a400a398502d7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 21:58:28 2008 +0100 shlwapi: Remove unneeded address-of operator from array name. --- dlls/shlwapi/ordinal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index d1668a6..d0bff7f 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4399,7 +4399,7 @@ PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *a { ret = GetTokenInformation(Token, TokenUser, (void*)tuUser, bufsize, &bufsize ); if (ret) - cur_user = ((PTOKEN_USER)&tuUser)->User.Sid; + cur_user = ((PTOKEN_USER)tuUser)->User.Sid; CloseHandle(Token); } }

1 0