May 2009 - Wine-Commits - list.winehq.org

Stefan Leichter : gdiplus: Add stub for GdipImageRotateFlip.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: cef15983908ef410ff201f90acbdbdd7ac453aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef15983908ef410ff201f90a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri May 8 07:31:15 2009 +0200 gdiplus: Add stub for GdipImageRotateFlip. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 9 +++++++++ include/gdiplusflat.h | 1 + include/gdiplusimaging.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c53456c..76c7328 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -409,7 +409,7 @@ @ stdcall GdipImageGetFrameCount(ptr ptr ptr) @ stdcall GdipImageGetFrameDimensionsCount(ptr ptr) @ stdcall GdipImageGetFrameDimensionsList(ptr ptr long) -@ stub GdipImageRotateFlip +@ stdcall GdipImageRotateFlip(ptr long) @ stdcall GdipImageSelectActiveFrame(ptr ptr long) @ stub GdipImageSetAbort @ stub GdipInitializePalette diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6ab3cca..9902f0f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1675,3 +1675,12 @@ GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage *image, UINT width, UINT heigh image, width, height, ret_image, cb, cb_data); return NotImplemented; } + +/***************************************************************************** + * GdipImageRotateFlip [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) +{ + FIXME("(%p %u) stub\n", image, type); + return NotImplemented; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3cc6d26..a7ee536 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -340,6 +340,7 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage*,UINT*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT); +GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage*,RotateFlipType); GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT); GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR*,GpImage**); diff --git a/include/gdiplusimaging.h b/include/gdiplusimaging.h index e8dda73..51a60ba 100644 --- a/include/gdiplusimaging.h +++ b/include/gdiplusimaging.h @@ -38,6 +38,33 @@ enum ImageLockMode ImageLockModeUserInputBuf = 4 }; +enum RotateFlipType +{ + RotateNoneFlipNone = 0, + Rotate180FlipXY = RotateNoneFlipNone, + + Rotate90FlipNone = 1, + Rotate270FlipXY = Rotate90FlipNone, + + Rotate180FlipNone = 2, + RotateNoneFlipXY = Rotate180FlipNone, + + Rotate270FlipNone = 3, + Rotate90FlipXY = Rotate270FlipNone, + + RotateNoneFlipX = 4, + Rotate180FlipY = RotateNoneFlipX, + + Rotate90FlipX = 5, + Rotate270FlipY = Rotate90FlipX, + + Rotate180FlipX = 6, + RotateNoneFlipY = Rotate180FlipX, + + Rotate270FlipX = 7, + Rotate90FlipY = Rotate270FlipX +}; + #ifdef __cplusplus class EncoderParameter { @@ -108,6 +135,7 @@ public: #else /* end of c++ typedefs */ typedef enum ImageLockMode ImageLockMode; +typedef enum RotateFlipType RotateFlipType; typedef struct EncoderParameter {

1 0

Vincent Povirk : gdiplus: Store the rect passed to GdipCreateLineBrushFromRect.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: aaee4d7f9d423496eecb626bfc6da7286c4e9308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaee4d7f9d423496eecb626bf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 7 11:40:13 2009 -0500 gdiplus: Store the rect passed to GdipCreateLineBrushFromRect. --- dlls/gdiplus/brush.c | 8 +++++++- dlls/gdiplus/tests/brush.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 7372ec0..cd1ba7f 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -301,6 +301,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, GpLineGradient **line) { GpPointF start, end; + GpStatus stat; TRACE("(%p, %x, %x, %d, %d, %p)\n", rect, startcolor, endcolor, mode, wrap, line); @@ -313,7 +314,12 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, end.X = rect->X + rect->Width; end.Y = rect->Y + rect->Height; - return GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); + stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); + + if (stat == Ok) + (*line)->rect = *rect; + + return stat; } GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 8ce5adb..b6fbe30 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -379,10 +379,10 @@ static void test_gradientgetrect(void) memset(&rectf, 0, sizeof(GpRectF)); status = GdipGetLineRect(brush, &rectf); expect(Ok, status); - todo_wine expectf(10.0, rectf.X); - todo_wine expectf(10.0, rectf.Y); - todo_wine expectf(-100.0, rectf.Width); - todo_wine expectf(-100.0, rectf.Height); + expectf(10.0, rectf.X); + expectf(10.0, rectf.Y); + expectf(-100.0, rectf.Width); + expectf(-100.0, rectf.Height); status = GdipDeleteBrush((GpBrush*)brush); }

1 0

Vincent Povirk : gdiplus: Use the mode passed to GdipCreateLineBrushFromRect.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 717ac52dda12e7df698bdf106b6143995496dee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=717ac52dda12e7df698bdf106… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 6 16:36:06 2009 -0500 gdiplus: Use the mode passed to GdipCreateLineBrushFromRect. --- dlls/gdiplus/brush.c | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index cd1ba7f..76e6a0f 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -309,10 +309,35 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, if(!line || !rect) return InvalidParameter; - start.X = rect->X; - start.Y = rect->Y; - end.X = rect->X + rect->Width; - end.Y = rect->Y + rect->Height; + switch (mode) + { + case LinearGradientModeHorizontal: + start.X = rect->X; + start.Y = rect->Y; + end.X = rect->X + rect->Width; + end.Y = rect->Y; + break; + case LinearGradientModeVertical: + start.X = rect->X; + start.Y = rect->Y; + end.X = rect->X; + end.Y = rect->Y + rect->Height; + break; + case LinearGradientModeForwardDiagonal: + start.X = rect->X; + start.Y = rect->Y; + end.X = rect->X + rect->Width; + end.Y = rect->Y + rect->Height; + break; + case LinearGradientModeBackwardDiagonal: + start.X = rect->X + rect->Width; + start.Y = rect->Y; + end.X = rect->X; + end.Y = rect->Y + rect->Height; + break; + default: + return InvalidParameter; + } stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line);

1 0

Vincent Povirk : gdiplus: Expand the GdipGetLineRect tests.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 550d02e1ad40de3807a59074c1292af32ea137f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=550d02e1ad40de3807a59074c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 7 11:28:08 2009 -0500 gdiplus: Expand the GdipGetLineRect tests. --- dlls/gdiplus/tests/brush.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index cabbd7f..8ce5adb 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -328,6 +328,34 @@ static void test_gradientgetrect(void) expectf(10.0, rectf.Width); todo_wine expectf(10.0, rectf.Height); status = GdipDeleteBrush((GpBrush*)brush); + /* slope = -1 */ + pt1.X = pt1.Y = 0.0; + pt2.X = 20.0; + pt2.Y = -20.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(Ok, status); + memset(&rectf, 0, sizeof(GpRectF)); + status = GdipGetLineRect(brush, &rectf); + expect(Ok, status); + expectf(0.0, rectf.X); + expectf(-20.0, rectf.Y); + expectf(20.0, rectf.Width); + expectf(20.0, rectf.Height); + status = GdipDeleteBrush((GpBrush*)brush); + /* slope = 1/100 */ + pt1.X = pt1.Y = 0.0; + pt2.X = 100.0; + pt2.Y = 1.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(Ok, status); + memset(&rectf, 0, sizeof(GpRectF)); + status = GdipGetLineRect(brush, &rectf); + expect(Ok, status); + expectf(0.0, rectf.X); + expectf(0.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(1.0, rectf.Height); + status = GdipDeleteBrush((GpBrush*)brush); /* from rect with LinearGradientModeHorizontal */ rectf.X = rectf.Y = 10.0; rectf.Width = rectf.Height = 100.0; @@ -342,6 +370,20 @@ static void test_gradientgetrect(void) expectf(100.0, rectf.Width); expectf(100.0, rectf.Height); status = GdipDeleteBrush((GpBrush*)brush); + /* passing negative Width/Height to LinearGradientModeHorizontal */ + rectf.X = rectf.Y = 10.0; + rectf.Width = rectf.Height = -100.0; + status = GdipCreateLineBrushFromRect(&rectf, 0, 0, LinearGradientModeHorizontal, + WrapModeTile, &brush); + expect(Ok, status); + memset(&rectf, 0, sizeof(GpRectF)); + status = GdipGetLineRect(brush, &rectf); + expect(Ok, status); + todo_wine expectf(10.0, rectf.X); + todo_wine expectf(10.0, rectf.Y); + todo_wine expectf(-100.0, rectf.Width); + todo_wine expectf(-100.0, rectf.Height); + status = GdipDeleteBrush((GpBrush*)brush); } static void test_lineblend(void)

1 0

Vincent Povirk : gdiplus: Store the rectangle in line gradient brushes.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 173a1f6f7981d395abfb46c5068f53b7ecc85fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173a1f6f7981d395abfb46c50… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 7 11:33:28 2009 -0500 gdiplus: Store the rectangle in line gradient brushes. --- dlls/gdiplus/brush.c | 11 ++++++----- dlls/gdiplus/gdiplus_private.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 60d5970..7372ec0 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -250,6 +250,11 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, (*line)->wrap = wrap; (*line)->gamma = FALSE; + (*line)->rect.X = (startpoint->X < endpoint->X ? startpoint->X: endpoint->X); + (*line)->rect.Y = (startpoint->Y < endpoint->Y ? startpoint->Y: endpoint->Y); + (*line)->rect.Width = fabs(startpoint->X - endpoint->X); + (*line)->rect.Height = fabs(startpoint->Y - endpoint->Y); + (*line)->blendcount = 1; (*line)->blendfac = GdipAlloc(sizeof(REAL)); (*line)->blendpos = GdipAlloc(sizeof(REAL)); @@ -1538,11 +1543,7 @@ GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient *brush, GpRectF *rect) if(!brush || !rect) return InvalidParameter; - rect->X = (brush->startpoint.X < brush->endpoint.X ? brush->startpoint.X: brush->endpoint.X); - rect->Y = (brush->startpoint.Y < brush->endpoint.Y ? brush->startpoint.Y: brush->endpoint.Y); - - rect->Width = fabs(brush->startpoint.X - brush->endpoint.X); - rect->Height = fabs(brush->startpoint.Y - brush->endpoint.Y); + *rect = brush->rect; return Ok; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e038baf..f3bf797 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -143,6 +143,7 @@ struct GpLineGradient{ GpPointF endpoint; ARGB startcolor; ARGB endcolor; + RectF rect; GpWrapMode wrap; BOOL gamma; REAL* blendfac; /* blend factors */

1 0

Michael Stefaniuc : notepad: Use the explicit W-form for some string functions.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 1a60da74f9816730c0e71a831dd55de6d1ec7080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a60da74f9816730c0e71a831… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 7 22:25:33 2009 +0200 notepad: Use the explicit W-form for some string functions. --- programs/notepad/dialog.c | 18 ++++++------ programs/notepad/main.c | 60 ++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a60da74f9816730c0e71…

1 0

Michael Stefaniuc : notepad: Use the explicit W-form of the registry functions.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 256d3a2ee1e86cff787164d3c07a616517c4dae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=256d3a2ee1e86cff787164d3c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 7 22:26:04 2009 +0200 notepad: Use the explicit W-form of the registry functions. --- programs/notepad/main.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index eaab3c3..8f7520e 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -89,12 +89,12 @@ DWORD get_dpi(void) DWORD dpi = 96; HKEY hkey; - if (RegOpenKey(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) { DWORD type, size, new_dpi; size = sizeof(new_dpi); - if(RegQueryValueEx(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS) + if(RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (LPBYTE)&new_dpi, &size) == ERROR_SUCCESS) { if(type == REG_DWORD && new_dpi != 0) dpi = new_dpi; @@ -115,7 +115,7 @@ static VOID NOTEPAD_SaveSettingToRegistry(void) HKEY hkey; DWORD disp; - if(RegCreateKeyEx(HKEY_CURRENT_USER, notepad_reg_key, 0, NULL, + if(RegCreateKeyExW(HKEY_CURRENT_USER, notepad_reg_key, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &disp) == ERROR_SUCCESS) { DWORD data; @@ -125,7 +125,7 @@ static VOID NOTEPAD_SaveSettingToRegistry(void) GetWindowPlacement(Globals.hMainWnd, &wndpl); main_rect = wndpl.rcNormalPosition; -#define SET_NOTEPAD_REG(hkey, value_name, value_data) do { DWORD data = (DWORD)(value_data); RegSetValueEx(hkey, value_name, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); }while(0) +#define SET_NOTEPAD_REG(hkey, value_name, value_data) do { DWORD data = value_data; RegSetValueExW(hkey, value_name, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); }while(0) SET_NOTEPAD_REG(hkey, value_fWrap, Globals.bWrapLongLines); SET_NOTEPAD_REG(hkey, value_iWindowPosX, main_rect.left); SET_NOTEPAD_REG(hkey, value_iWindowPosY, main_rect.top); @@ -150,15 +150,15 @@ static VOID NOTEPAD_SaveSettingToRegistry(void) /* Store the current value as 10 * twips */ data = MulDiv(abs(Globals.lfFont.lfHeight), 720 , get_dpi()); - RegSetValueEx(hkey, value_iPointSize, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); + RegSetValueExW(hkey, value_iPointSize, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); - RegSetValueEx(hkey, value_lfFaceName, 0, REG_SZ, (LPBYTE)&Globals.lfFont.lfFaceName, + RegSetValueExW(hkey, value_lfFaceName, 0, REG_SZ, (LPBYTE)&Globals.lfFont.lfFaceName, lstrlenW(Globals.lfFont.lfFaceName) * sizeof(Globals.lfFont.lfFaceName[0])); - RegSetValueEx(hkey, value_szHeader, 0, REG_SZ, (LPBYTE)&Globals.szHeader, + RegSetValueExW(hkey, value_szHeader, 0, REG_SZ, (LPBYTE)&Globals.szHeader, lstrlenW(Globals.szHeader) * sizeof(Globals.szHeader[0])); - RegSetValueEx(hkey, value_szFooter, 0, REG_SZ, (LPBYTE)&Globals.szFooter, + RegSetValueExW(hkey, value_szFooter, 0, REG_SZ, (LPBYTE)&Globals.szFooter, lstrlenW(Globals.szFooter) * sizeof(Globals.szFooter[0])); RegCloseKey(hkey); @@ -210,12 +210,12 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void) LoadString(Globals.hInstance, STRING_PAGESETUP_FOOTERVALUE, Globals.szFooter, sizeof(Globals.szFooter) / sizeof(Globals.szFooter[0])); - if(RegOpenKey(HKEY_CURRENT_USER, notepad_reg_key, &hkey) == ERROR_SUCCESS) + if(RegOpenKeyW(HKEY_CURRENT_USER, notepad_reg_key, &hkey) == ERROR_SUCCESS) { WORD data_helper[MAX_PATH]; DWORD type, data, size; -#define QUERY_NOTEPAD_REG(hkey, value_name, ret) do { DWORD type, data; DWORD size = sizeof(DWORD); if(RegQueryValueEx(hkey, value_name, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) if(type == REG_DWORD) ret = (typeof(ret))data; } while(0) +#define QUERY_NOTEPAD_REG(hkey, value_name, ret) do { DWORD type, data; DWORD size = sizeof(DWORD); if(RegQueryValueExW(hkey, value_name, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) if(type == REG_DWORD) ret = data; } while(0) QUERY_NOTEPAD_REG(hkey, value_fWrap, Globals.bWrapLongLines); QUERY_NOTEPAD_REG(hkey, value_iWindowPosX, main_rect.left); QUERY_NOTEPAD_REG(hkey, value_iWindowPosY, main_rect.top); @@ -242,23 +242,23 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void) main_rect.bottom = main_rect.top + dy; size = sizeof(DWORD); - if(RegQueryValueEx(hkey, value_iPointSize, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) + if(RegQueryValueExW(hkey, value_iPointSize, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) if(type == REG_DWORD) /* The value is stored as 10 * twips */ Globals.lfFont.lfHeight = -MulDiv(abs(data), get_dpi(), 720); size = sizeof(Globals.lfFont.lfFaceName); - if(RegQueryValueEx(hkey, value_lfFaceName, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS) + if(RegQueryValueExW(hkey, value_lfFaceName, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS) if(type == REG_SZ) lstrcpyW(Globals.lfFont.lfFaceName, data_helper); size = sizeof(Globals.szHeader); - if(RegQueryValueEx(hkey, value_szHeader, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS) + if(RegQueryValueExW(hkey, value_szHeader, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS) if(type == REG_SZ) lstrcpyW(Globals.szHeader, data_helper); size = sizeof(Globals.szFooter); - if(RegQueryValueEx(hkey, value_szFooter, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS) + if(RegQueryValueExW(hkey, value_szFooter, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS) if(type == REG_SZ) lstrcpyW(Globals.szFooter, data_helper); RegCloseKey(hkey);

1 0

Hans Leidekker : pdh: Implement PdhMakeCounterPathA/W.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 754b97c72c38f736100c6542af234c31a4bf7a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=754b97c72c38f736100c6542a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 8 11:17:15 2009 +0200 pdh: Implement PdhMakeCounterPathA/W. --- dlls/pdh/pdh.spec | 4 +- dlls/pdh/pdh_main.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/pdh/tests/pdh.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ include/pdh.h | 3 + 4 files changed, 207 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=754b97c72c38f736100c6…

1 0

Marcus Meissner : crypt32: Change salt allocation to handle errors ( Coverity 133).
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 9990bde993e67de7f225fc15151bdebacd823832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9990bde993e67de7f225fc151… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri May 8 00:00:01 2009 +0200 crypt32: Change salt allocation to handle errors (Coverity 133). --- dlls/crypt32/protectdata.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 401e820..e6ac16e 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -616,11 +616,9 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr, return FALSE; } pInfo->salt.cbData=CRYPT32_PROTECTDATA_SALT_LEN; + /* debug: show our salt */ + TRACE_DATA_BLOB(&pInfo->salt); } - - /* debug: show our salt */ - TRACE_DATA_BLOB(&pInfo->salt); - pInfo->cipher.cbData=0; pInfo->cipher.pbData=NULL;

1 0

Juan Lang : inetmib1: Return errors from SnmpExtensionQuery.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 782efb5702daf4cd5891f5a1811d7aa0aa97f115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782efb5702daf4cd5891f5a18… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 7 09:29:11 2009 -0700 inetmib1: Return errors from SnmpExtensionQuery. --- dlls/inetmib1/main.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 3269b07..1093117 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1279,6 +1279,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, AsnObjectIdentifier mib2oid = DEFINE_OID(mib2); AsnInteger32 error = SNMP_ERRORSTATUS_NOERROR, errorIndex = 0; UINT i; + BOOL ret = TRUE; TRACE("(0x%02x, %p, %p, %p)\n", bPduType, pVarBindList, pErrorStatus, pErrorIndex); @@ -1300,7 +1301,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, impl = findSupportedQuery(pVarBindList->list[i].name.ids, len, &matchingIndex); if (impl && impl->query) - impl->query(bPduType, &pVarBindList->list[i], &error); + ret = impl->query(bPduType, &pVarBindList->list[i], &error); else error = SNMP_ERRORSTATUS_NOSUCHNAME; if (error == SNMP_ERRORSTATUS_NOSUCHNAME && @@ -1317,7 +1318,8 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, error = SNMP_ERRORSTATUS_NOERROR; impl = &supportedIDs[matchingIndex]; if (impl->query) - impl->query(bPduType, &pVarBindList->list[i], &error); + ret = impl->query(bPduType, &pVarBindList->list[i], + &error); else error = SNMP_ERRORSTATUS_NOSUCHNAME; } @@ -1327,7 +1329,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, if (error == SNMP_ERRORSTATUS_NOSUCHNAME) { SnmpUtilOidFree(&pVarBindList->list[i].name); - SnmpUtilOidCpy(&pVarBindList->list[i].name, + ret = SnmpUtilOidCpy(&pVarBindList->list[i].name, &supportedIDs[matchingIndex - 1].name); pVarBindList->list[i].name.ids[ pVarBindList->list[i].name.idLength - 1] += 1; @@ -1339,7 +1341,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, } *pErrorStatus = error; *pErrorIndex = errorIndex; - return TRUE; + return ret; } /*****************************************************************************

1 0