winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
1278 discussions
Start a n
N
ew thread
Andrew Talbot : wined3d: Remove unused variables.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: 0de14c37e53b1992a11b2afa5274b69633a8a2e1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0de14c37e53b1992a11b2afa5…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 29 21:29:45 2008 +0100 wined3d: Remove unused variables. --- dlls/wined3d/arb_program_shader.c | 8 -------- dlls/wined3d/device.c | 8 +++----- dlls/wined3d/drawprim.c | 2 -- dlls/wined3d/surface.c | 3 --- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6bed3c5..bc55712 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1226,9 +1226,6 @@ void pshader_hw_texreg2ar(SHADER_OPCODE_ARG* arg) { void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { SHADER_BUFFER* buffer = arg->buffer; - IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - DWORD flags; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; char dst_str[8]; @@ -1238,23 +1235,18 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[0], 0, src_str); shader_addline(buffer, "MOV TMP.r, %s.g;\n", src_str); shader_addline(buffer, "MOV TMP.g, %s.b;\n", src_str); - flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(arg, reg1, dst_str, "TMP", FALSE, FALSE); } void pshader_hw_texreg2rgb(SHADER_OPCODE_ARG* arg) { SHADER_BUFFER* buffer = arg->buffer; - IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - DWORD flags; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; char dst_str[8]; char src_str[50]; sprintf(dst_str, "T%u", reg1); pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[0], 0, src_str); - flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(arg, reg1, dst_str, src_str, FALSE, FALSE); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89eb835..5021d97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7334,11 +7334,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetCreationParameters(IWineD3DDevice static void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT iSwapChain, DWORD Flags, CONST WINED3DGAMMARAMP* pRamp) { IWineD3DSwapChain *swapchain; - HRESULT hrc = WINED3D_OK; TRACE("Relaying to swapchain\n"); - if ((hrc = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain)) == WINED3D_OK) { + if (IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain) == WINED3D_OK) { IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, (WINED3DGAMMARAMP *)pRamp); IWineD3DSwapChain_Release(swapchain); } @@ -7347,12 +7346,11 @@ static void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT iSwapChain, WINED3DGAMMARAMP* pRamp) { IWineD3DSwapChain *swapchain; - HRESULT hrc = WINED3D_OK; TRACE("Relaying to swapchain\n"); - if ((hrc = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain)) == WINED3D_OK) { - hrc =IWineD3DSwapChain_GetGammaRamp(swapchain, pRamp); + if (IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain) == WINED3D_OK) { + IWineD3DSwapChain_GetGammaRamp(swapchain, pRamp); IWineD3DSwapChain_Release(swapchain); } return; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 35822c9..e8b39f8 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -156,7 +156,6 @@ void primitiveDeclarationConvertToStridedData( int i; WINED3DVERTEXELEMENT *element; DWORD stride; - int reg; DWORD numPreloadStreams = This->stateBlock->streamIsUP ? 0 : vertexDeclaration->num_streams; DWORD *streams = vertexDeclaration->streams; @@ -214,7 +213,6 @@ void primitiveDeclarationConvertToStridedData( } } data += element->Offset; - reg = element->Reg; TRACE("Offset %d Stream %d UsageIndex %d\n", element->Offset, element->Stream, element->UsageIndex); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c462bd2..2c84f0c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -868,7 +868,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) int bpp; GLenum format, internal, type; CONVERT_TYPES convert; - BOOL srcIsUpsideDown; GLint prevRead; d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, This->srgb); @@ -895,7 +894,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) */ TRACE("Locking offscreen render target\n"); glReadBuffer(device->offscreenBuffer); - srcIsUpsideDown = TRUE; } else { GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain); TRACE("Locking %#x buffer\n", buffer); @@ -903,7 +901,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) checkGLcall("glReadBuffer"); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - srcIsUpsideDown = FALSE; } if(!(This->Flags & SFLAG_ALLOCATED)) {
1
0
0
0
Andrew Talbot : uxtheme: Remove unused variable.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: 471fb146a4857e21d938fdaca2472ef5e4f1777b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=471fb146a4857e21d938fdaca…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 29 21:29:31 2008 +0100 uxtheme: Remove unused variable. --- dlls/uxtheme/draw.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 9c7d62b..8b3b959 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -196,7 +196,6 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, WCHAR szPath[MAX_PATH]; int imagelayout = IL_HORIZONTAL; int imagecount = 1; - int imagenum; BITMAP bmp; HBITMAP hBmp; BOOL hasAlpha; @@ -209,7 +208,6 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGELAYOUT, &imagelayout); GetThemeInt(hTheme, iPartId, iStateId, TMT_IMAGECOUNT, &imagecount); - imagenum = max (min (imagecount, iStateId), 1) - 1; GetObjectW(hBmp, sizeof(bmp), &bmp); if(imagelayout == IL_VERTICAL) { reqsize.x = bmp.bmWidth;
1
0
0
0
Andrew Talbot : user32: Remove unused variables.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: d8ce2207b8935c4b3fd55fea43495227eefebc04 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d8ce2207b8935c4b3fd55fea4…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 29 21:23:57 2008 +0100 user32: Remove unused variables. --- dlls/user32/caret.c | 4 ---- dlls/user32/cursoricon.c | 3 +-- dlls/user32/dde_server.c | 3 --- dlls/user32/edit.c | 2 -- dlls/user32/menu.c | 3 +-- dlls/user32/message.c | 7 ++----- dlls/user32/user16.c | 2 -- dlls/user32/winpos.c | 2 -- 8 files changed, 4 insertions(+), 22 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 8487f0c..8ff8da2 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -77,7 +77,6 @@ static void CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT_PTR id, DWORD cti { BOOL ret; RECT r; - int old_state = 0; int hidden = 0; SERVER_START_REQ( set_caret_info ) @@ -95,7 +94,6 @@ static void CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT_PTR id, DWORD cti r.top = reply->old_rect.top; r.right = reply->old_rect.right; r.bottom = reply->old_rect.bottom; - old_state = reply->old_state; hidden = reply->old_hide; } } @@ -332,7 +330,6 @@ BOOL WINAPI ShowCaret( HWND hwnd ) { BOOL ret; RECT r; - int old_state = 0; int hidden = 0; SERVER_START_REQ( set_caret_info ) @@ -350,7 +347,6 @@ BOOL WINAPI ShowCaret( HWND hwnd ) r.top = reply->old_rect.top; r.right = reply->old_rect.right; r.bottom = reply->old_rect.bottom; - old_state = reply->old_state; hidden = reply->old_hide; } } diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 153a2a4..5dbc1b9 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -384,11 +384,10 @@ static ICONCACHE* CURSORICON_FindCache(HICON hIcon) ICONCACHE *ptr; ICONCACHE *pRet=NULL; BOOL IsFound = FALSE; - int count; EnterCriticalSection( &IconCrst ); - for (count = 0, ptr = IconAnchor; ptr != NULL && !IsFound; ptr = ptr->next, count++ ) + for (ptr = IconAnchor; ptr != NULL && !IsFound; ptr = ptr->next) { if ( hIcon == ptr->hIcon ) { diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index a1c2425..a2064a0 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -165,12 +165,9 @@ HDDEDATA WINAPI DdeNameService(DWORD idInst, HSZ hsz1, HSZ hsz2, UINT afCmd) { WDML_SERVER* pServer; WDML_INSTANCE* pInstance; - HDDEDATA hDdeData; HWND hwndServer; WNDCLASSEXW wndclass; - hDdeData = NULL; - TRACE("(%d,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd); /* First check instance diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b58dc96..b37b5dc 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3424,7 +3424,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) { if (es->style & ES_MULTILINE) { INT l; - INT li; INT vlc; INT ww; INT cw = es->char_width; @@ -3433,7 +3432,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) INT dx = 0; l = EDIT_EM_LineFromChar(es, es->selection_end); - li = EDIT_EM_LineIndex(es, l); x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)); vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; if (l >= es->y_offset + vlc) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 7a14d87..49de5e1 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -679,11 +679,10 @@ MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect) { if (menu->bScrolling) { - UINT arrow_bitmap_width, arrow_bitmap_height; + UINT arrow_bitmap_height; BITMAP bmp; GetObjectW(get_up_arrow_bitmap(), sizeof(bmp), &bmp); - arrow_bitmap_width = bmp.bmWidth; arrow_bitmap_height = bmp.bmHeight; rect->top += arrow_bitmap_height - menu->nScrollPos; rect->bottom += arrow_bitmap_height - menu->nScrollPos; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7f1b68b..542298a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2226,7 +2226,7 @@ static void wait_message_reply( UINT flags ) for (;;) { - unsigned int wake_bits = 0, changed_bits = 0; + unsigned int wake_bits = 0; DWORD dwlc, res; SERVER_START_REQ( set_queue_mask ) @@ -2235,10 +2235,7 @@ static void wait_message_reply( UINT flags ) req->changed_mask = req->wake_mask; req->skip_wait = 1; if (!wine_server_call( req )) - { - wake_bits = reply->wake_bits; - changed_bits = reply->changed_bits; - } + wake_bits = reply->wake_bits; } SERVER_END_REQ; diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index b55c8ed..64a160f 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -951,11 +951,9 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); HANDLE16 oldDS = stack16->ds; HINSTANCE16 gdi_inst; - WORD gdi_heap; int userPercent, gdiPercent; if ((gdi_inst = LoadLibrary16( "GDI" )) < 32) return 0; - gdi_heap = gdi_inst | 7; switch(resType) { diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 78749a9..b325384 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1867,7 +1867,6 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, WND *win; BOOL ret; RECT visible_rect, old_window_rect; - DWORD new_style; if (!(win = WIN_GetPtr( hwnd ))) return FALSE; if (win == WND_DESKTOP || win == WND_OTHER_PROCESS) return FALSE; @@ -1901,7 +1900,6 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } } SERVER_END_REQ; - new_style = win->dwStyle; WIN_ReleasePtr( win ); if (ret)
1
0
0
0
Markus Weiland : dxdiagn: Implemented ullPhysicalMemory property for DXDiagSystemInfoContainer.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: 2a87ef68c57022bf40137691d552dd5a173f3bef URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2a87ef68c57022bf40137691d…
Author: Markus Weiland <kde(a)graph-ix.net> Date: Tue Apr 29 18:24:59 2008 +0200 dxdiagn: Implemented ullPhysicalMemory property for DXDiagSystemInfoContainer. --- dlls/dxdiagn/provider.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 23da024..006310a 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -269,6 +269,7 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) static const WCHAR szDirectXVersionEnglish_v[] = {'4','.','0','9','.','0','0','0','0','.','0','9','0','4',0}; static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0}; static const WCHAR szDirectXVersionLongEnglish_v[] = {'=',' ','"','D','i','r','e','c','t','X',' ','9','.','0','c',' ','(','4','.','0','9','.','0','0','0','0','.','0','9','0','4',')',0}; + static const WCHAR ullPhysicalMemory[] = {'u','l','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ /*szWindowsDir*/ /*szWindowsDir*/ @@ -276,6 +277,7 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) /*"dwOSMinorVersion"*/ /*"dwOSBuildNumber"*/ /*"dwOSPlatformID"*/ + MEMORYSTATUSEX msex; VARIANT v; V_VT(&v) = VT_UI4; V_UI4(&v) = 9; @@ -297,6 +299,13 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); VariantClear(&v); + msex.dwLength = sizeof(msex); + GlobalMemoryStatusEx( &msex ); + V_VT(&v) = VT_UI8; + V_UI8(&v) = msex.ullTotalPhys; + hr = IDxDiagContainerImpl_AddProp(pSubCont, ullPhysicalMemory, &v); + VariantClear(&v); + return hr; }
1
0
0
0
Roderick Colenbrander : wined3d: Add multisampling support.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: 628e4eece3b9bc724f8873aa3c078f545da887cc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=628e4eece3b9bc724f8873aa3…
Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Apr 28 21:44:21 2008 +0000 wined3d: Add multisampling support. --- dlls/wined3d/context.c | 29 +++++++++---- dlls/wined3d/directx.c | 86 ++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_gl.h | 5 ++ 4 files changed, 101 insertions(+), 20 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=628e4eece3b9bc724f887…
1
0
0
0
Dmitry Timoshkov : winecfg: Add a font size preview, update all language resources to reflect this change.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: 727eef4e4fe4642419c04777233734f71db1f998 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=727eef4e4fe4642419c047772…
Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 30 00:27:15 2008 +0900 winecfg: Add a font size preview, update all language resources to reflect this change. --- programs/winecfg/Bg.rc | 45 ++++++++++++++++---------------------- programs/winecfg/Cs.rc | 44 ++++++++++++++++--------------------- programs/winecfg/De.rc | 43 ++++++++++++++++--------------------- programs/winecfg/En.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Es.rc | 44 ++++++++++++++++--------------------- programs/winecfg/Fi.rc | 44 ++++++++++++++++--------------------- programs/winecfg/Fr.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Hu.rc | 45 ++++++++++++++++---------------------- programs/winecfg/It.rc | 37 +++++++++++++++++-------------- programs/winecfg/Ja.rc | 42 ++++++++++++++++-------------------- programs/winecfg/Ko.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Nl.rc | 47 ++++++++++++++++------------------------ programs/winecfg/No.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Pl.rc | 47 ++++++++++++++++------------------------ programs/winecfg/Pt.rc | 40 ++++++++++++++++++---------------- programs/winecfg/Ro.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Ru.rc | 48 ++++++++++++++++------------------------- programs/winecfg/Si.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Sv.rc | 44 ++++++++++++++++--------------------- programs/winecfg/Tr.rc | 44 ++++++++++++++++--------------------- programs/winecfg/Zh.rc | 44 ++++++++++++++++--------------------- programs/winecfg/resource.h | 1 + programs/winecfg/x11drvdlg.c | 36 ++++++++++++++++++++++++++++++- 23 files changed, 438 insertions(+), 533 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=727eef4e4fe4642419c04…
1
0
0
0
Elias Benali : winhelp: Check against a NULL pointer dereference.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: 38daafb77e8c0e507926d3c2749f20bc0065d1e6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=38daafb77e8c0e507926d3c27…
Author: Elias Benali <elptr(a)users.sourceforge.net> Date: Tue Apr 29 11:19:33 2008 -0400 winhelp: Check against a NULL pointer dereference. --- programs/winhelp/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 62eb98f..2577a83 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -579,7 +579,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe } SetWindowPos(win->hMainWnd, HWND_TOP, pt.x, pt.y, sz.cx, sz.cy, flags); - if (wpage->page && wpage->page->file != win->page->file) + if (wpage->page && win->page && wpage->page->file != win->page->file) WINHELP_DeleteBackSet(win); WINHELP_InitFonts(win->hMainWnd);
1
0
0
0
Alex Villacís Lasso : richedit: On failure to parse incoming text as RTF, EM_STREAMIN must set dwError to -16.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: 2ab63774f1654a45ab82aac9d41cf759af3b9a4a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2ab63774f1654a45ab82aac9d…
Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 28 22:43:49 2008 -0500 richedit: On failure to parse incoming text as RTF, EM_STREAMIN must set dwError to -16. --- dlls/riched20/editor.c | 1 + dlls/riched20/tests/editor.c | 10 +++++++++- dlls/riched32/tests/editor.c | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 392a60a..c867df9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1073,6 +1073,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre || (editor->bEmulateVersion10 && *inStream.buffer != '{')) { invalidRTF = TRUE; + inStream.editstream->dwError = -16; } } } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 891c713..fff8119 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2575,6 +2575,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 0 set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par */ es.dwCookie = (DWORD_PTR)&streamText0a; @@ -2589,6 +2590,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0-a set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ es.dwCookie = (DWORD_PTR)&streamText0b; @@ -2603,6 +2605,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText\r\n"); ok (result == 0, "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0-b set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; @@ -2616,8 +2619,10 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 1 set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 1 set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText2; + es.dwError = 0; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); @@ -2626,16 +2631,19 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 2 returned %ld, expected 0\n", result); ok (strlen(buffer) == 0, "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); + ok(es.dwError == -16, "EM_STREAMIN: Test 2 set error %d, expected %d\n", es.dwError, -16); es.dwCookie = (DWORD_PTR)&streamText3; + es.dwError = 0; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 0, - "EM_STREAMIN: Test 3 returned %ld, expected 9\n", result); + "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); ok (strlen(buffer) == 0, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); + ok(es.dwError == -16, "EM_STREAMIN: Test 3 set error %d, expected %d\n", es.dwError, -16); DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index abecaee..b4082c4 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -213,6 +213,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 0 set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par */ es.dwCookie = (DWORD_PTR)&streamText0a; @@ -227,6 +228,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ es.dwCookie = (DWORD_PTR)&streamText0b; @@ -241,6 +243,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText\r\n"); ok (result == 0, "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; @@ -254,9 +257,11 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 1 set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText2; + es.dwError = 0; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); @@ -270,8 +275,10 @@ static void test_EM_STREAMIN(void) ok (result == 0, "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); } + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText3; + es.dwError = 0; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); @@ -280,6 +287,7 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); ok (strlen(buffer) == 0, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); + ok(es.dwError == -16, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, -16); DestroyWindow(hwndRichEdit); }
1
0
0
0
Alexandre Julliard : loader: Add stub versions of the pthread functions.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: 679aab877f57d012ac7513390567115dd3feae3f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=679aab877f57d012ac7513390…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:19:02 2008 +0200 loader: Add stub versions of the pthread functions. --- loader/pthread.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 43 insertions(+), 4 deletions(-) diff --git a/loader/pthread.c b/loader/pthread.c index 7414e98..dd1a3ba 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -21,8 +21,6 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_PTHREAD_H - #include <assert.h> #include <stdlib.h> #include <signal.h> @@ -45,6 +43,8 @@ #include "wine/library.h" #include "wine/pthread.h" +#ifdef HAVE_PTHREAD_H + static int init_done; static int nb_threads = 1; @@ -201,6 +201,47 @@ static void DECLSPEC_NORETURN abort_thread( long status ) pthread_exit( (void *)status ); } +#else /* HAVE_PTHREAD_H */ + +static void init_process( const struct wine_pthread_callbacks *callbacks, size_t size ) +{ +} + +static void init_thread( struct wine_pthread_thread_info *info ) +{ +} + +static int create_thread( struct wine_pthread_thread_info *info ) +{ + return -1; +} + +static void init_current_teb( struct wine_pthread_thread_info *info ) +{ +} + +static void *get_current_teb(void) +{ + return NULL; +} + +static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info ) +{ + abort(); +} + +static void DECLSPEC_NORETURN abort_thread( long status ) +{ + abort(); +} + +static int pthread_sigmask( int how, const sigset_t *newset, sigset_t *oldset ) +{ + return -1; +} + +#endif /* HAVE_PTHREAD_H */ + /*********************************************************************** * pthread_functions @@ -216,5 +257,3 @@ const struct wine_pthread_functions pthread_functions = abort_thread, pthread_sigmask }; - -#endif /* HAVE_PTHREAD_H */
1
0
0
0
Alexandre Julliard : Include wine/port.h everywhere we use exceptions.
by Alexandre Julliard
30 Apr '08
30 Apr '08
Module: wine Branch: master Commit: ef07d83405b8344fb8ebd1dbf9317d79d7528cbe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ef07d83405b8344fb8ebd1dbf…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:18:49 2008 +0200 Include wine/port.h everywhere we use exceptions. --- dlls/advapi32/service.c | 3 +++ dlls/crypt32/msg.c | 4 ++++ dlls/crypt32/serialize.c | 4 ++++ dlls/msi/custom.c | 3 +++ dlls/ole32/moniker.c | 3 +++ dlls/oleaut32/tmarshal.c | 1 + dlls/rpcrt4/cstub.c | 3 +++ dlls/wintrust/asn.c | 4 ++++ programs/winedbg/tgt_minidump.c | 1 + 9 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f9115c2..a1407dd 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <string.h> #include <time.h> diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0972436..1bb8767 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -15,6 +15,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 5017c3f..5f9911f 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -15,6 +15,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 316fe5a..71864d5 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #define COBJMACROS #include <stdarg.h> diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 68ea4d1..374b5c8 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <string.h> diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 80d435e..97500bf 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 83a5fb2..c790ad5 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #define COBJMACROS diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index af7a266..2b0bde1 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -17,6 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h> #include <assert.h> diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index db0daf6..87f34a2 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -22,6 +22,7 @@ #define NONAMELESSSTRUCT #include "config.h" +#include "wine/port.h" #include <stdlib.h> #include <stdio.h>
1
0
0
0
← Newer
1
2
3
4
5
6
7
...
128
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
Results per page:
10
25
50
100
200