October 2011 - Wine-commits

Michael Stefaniuc : sane.ds: Don't compare with TRUE.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 43b7a0db48465a5af15f60558435f2e3db531be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b7a0db48465a5af15f60558… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 1 21:42:21 2011 +0200 sane.ds: Don't compare with TRUE. --- dlls/sane.ds/ui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 5d4cd83..d57376e 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -994,7 +994,7 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM switch (((NMHDR*)lParam)->code) { case PSN_APPLY: - if (psn->lParam == TRUE) + if (psn->lParam) { activeDS.currentState = 6; if (activeDS.windowMessage)

1 0

Michael Stefaniuc : wordpad: Don't compare with TRUE.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 3e59606a3c7dffda0bb39d3c54b89851061c40ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e59606a3c7dffda0bb39d3c5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 1 21:44:54 2011 +0200 wordpad: Don't compare with TRUE. --- programs/wordpad/wordpad.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index feb618c..c5317ab 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -601,9 +601,9 @@ static void dialog_choose_font(void) fmt.dwEffects |= CFE_BOLD; if(cf.nFontType & ITALIC_FONTTYPE) fmt.dwEffects |= CFE_ITALIC; - if(cf.lpLogFont->lfUnderline == TRUE) + if(cf.lpLogFont->lfUnderline) fmt.dwEffects |= CFE_UNDERLINE; - if(cf.lpLogFont->lfStrikeOut == TRUE) + if(cf.lpLogFont->lfStrikeOut) fmt.dwEffects |= CFE_STRIKEOUT; fmt.crTextColor = cf.rgbColors;

1 0

Michael Stefaniuc : msxml3: Use SUCCEEDED instead of !FAILED.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 718a924f5b8c8f19bc6538a6caf69ab409db07e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718a924f5b8c8f19bc6538a6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 1 20:31:34 2011 +0200 msxml3: Use SUCCEEDED instead of !FAILED. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d4fcc1c..2eedc78 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2760,7 +2760,7 @@ static HRESULT WINAPI domdoc_validateNode( { hr = SchemaCache_validate_tree(This->properties->schemaCache, get_node_obj(node)->node); - if (!FAILED(hr)) + if (SUCCEEDED(hr)) { ++validated; /* TODO: get a real error code here */

1 0

André Hentschel : winevdm: Don't give up if we can' t shorten the current directory.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 42c1b06a134d71592017062a72364b9e38ea407b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c1b06a134d71592017062a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 2 16:37:29 2011 +0200 winevdm: Don't give up if we can't shorten the current directory. --- programs/winevdm/winevdm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 7950985..288fa01 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -165,7 +165,7 @@ static void start_dosbox( const char *appname, const char *args ) if (!GetTempFileNameW( path, cfgW, 0, config )) return; if (!GetCurrentDirectoryW( MAX_PATH, path )) return; if (!GetShortPathNameA( appname, app, MAX_PATH )) return; - if (!GetShortPathNameW( path, path, MAX_PATH )) return; + GetShortPathNameW( path, path, MAX_PATH ); file = CreateFileW( config, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); if (file == INVALID_HANDLE_VALUE) return;

1 0

Vincent Povirk : gdiplus: Include an alpha channel in HBITMAPs created from Bitmaps.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 5f946531593a0f934cccc22eb1f67f27d268501e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f946531593a0f934cccc22eb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 29 11:58:17 2011 -0500 gdiplus: Include an alpha channel in HBITMAPs created from Bitmaps. --- dlls/gdiplus/image.c | 26 +++++++++-------------- dlls/gdiplus/tests/image.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index fe1656f..4ae1d64 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1370,12 +1370,12 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background) { GpStatus stat; - HBITMAP result, oldbitmap; + HBITMAP result; UINT width, height; HDC hdc; - GpGraphics *graphics; BITMAPINFOHEADER bih; - void *bits; + LPBYTE bits; + BitmapData lockeddata; TRACE("(%p,%p,%x)\n", bitmap, hbmReturn, background); if (!bitmap || !hbmReturn) return InvalidParameter; @@ -1398,25 +1398,19 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, hdc = CreateCompatibleDC(NULL); if (!hdc) return GenericError; - result = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, &bits, + result = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&bits, NULL, 0); if (result) { - oldbitmap = SelectObject(hdc, result); - - stat = GdipCreateFromHDC(hdc, &graphics); - if (stat == Ok) - { - stat = GdipGraphicsClear(graphics, background); + lockeddata.Stride = -width * 4; + lockeddata.Scan0 = bits - (lockeddata.Stride * (height - 1)); - if (stat == Ok) - stat = GdipDrawImage(graphics, (GpImage*)bitmap, 0, 0); + stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead|ImageLockModeUserInputBuf, + PixelFormat32bppPARGB, &lockeddata); - GdipDeleteGraphics(graphics); - } - - SelectObject(hdc, oldbitmap); + if (stat == Ok) + stat = GdipBitmapUnlockBits(bitmap, &lockeddata); } else stat = GenericError; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 77aec93..44554a5 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1514,6 +1514,12 @@ static void test_createhbitmap(void) expect(32, bm.bmBitsPixel); ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0xff686868, "got %x, expected 0xff686868\n", val); + } + hdc = CreateCompatibleDC(NULL); oldhbitmap = SelectObject(hdc, hbitmap); @@ -1529,6 +1535,49 @@ static void test_createhbitmap(void) stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); + + /* create alpha Bitmap */ + stat = GdipCreateBitmapFromScan0(8, 20, 32, PixelFormat32bppARGB, bits, &bitmap); + expect(Ok, stat); + + /* create HBITMAP */ + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0); + expect(Ok, stat); + + if (stat == Ok) + { + ret = GetObjectA(hbitmap, sizeof(BITMAP), &bm); + expect(sizeof(BITMAP), ret); + + expect(0, bm.bmType); + expect(8, bm.bmWidth); + expect(20, bm.bmHeight); + expect(32, bm.bmWidthBytes); + expect(1, bm.bmPlanes); + expect(32, bm.bmBitsPixel); + ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0x682a2a2a, "got %x, expected 0x682a2a2a\n", val); + } + + hdc = CreateCompatibleDC(NULL); + + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 5, 5); + SelectObject(hdc, oldhbitmap); + + DeleteDC(hdc); + + expect(0x2a2a2a, pixel); + + DeleteObject(hbitmap); + } + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); } static void test_getthumbnail(void)

1 0

Nikolay Sivov : comctl32/monthcal: After notification safely free buffer allocated on heap.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 40c783fcc10e47c9653322644956021029368a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c783fcc10e47c9653322644… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 30 23:41:04 2011 +0400 comctl32/monthcal: After notification safely free buffer allocated on heap. --- dlls/comctl32/monthcal.c | 29 +++++++++++++++-------------- dlls/comctl32/tests/monthcal.c | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a2d8a19..0c51075 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1884,24 +1884,25 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) /* MCN_GETDAYSTATE notification helper */ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) { - if(infoPtr->dwStyle & MCS_DAYSTATE) { - NMDAYSTATE nmds; + MONTHDAYSTATE *state; + NMDAYSTATE nmds; - nmds.nmhdr.hwndFrom = infoPtr->hwndSelf; - nmds.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); - nmds.nmhdr.code = MCN_GETDAYSTATE; - nmds.cDayState = MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0); - nmds.prgDayState = Alloc(nmds.cDayState * sizeof(MONTHDAYSTATE)); + if (!(infoPtr->dwStyle & MCS_DAYSTATE)) return; - MONTHCAL_GetMinDate(infoPtr, &nmds.stStart); - nmds.stStart.wDay = 1; + nmds.nmhdr.hwndFrom = infoPtr->hwndSelf; + nmds.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); + nmds.nmhdr.code = MCN_GETDAYSTATE; + nmds.cDayState = MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0); + nmds.prgDayState = state = Alloc(nmds.cDayState * sizeof(MONTHDAYSTATE)); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); - memcpy(infoPtr->monthdayState, nmds.prgDayState, - MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0)*sizeof(MONTHDAYSTATE)); + MONTHCAL_GetMinDate(infoPtr, &nmds.stStart); + nmds.stStart.wDay = 1; - Free(nmds.prgDayState); - } + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); + memcpy(infoPtr->monthdayState, nmds.prgDayState, + MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0)*sizeof(MONTHDAYSTATE)); + + Free(state); } /* no valid range check performed */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 2686fb7..9775095 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -466,6 +466,29 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP add_message(sequences, PARENT_SEQ_INDEX, &msg); } + if (message == WM_NOTIFY) + { + NMHDR *hdr = (NMHDR*)lParam; + switch (hdr->code) + { + case MCN_GETDAYSTATE: + { + NMDAYSTATE *nmstate = (NMDAYSTATE*)lParam; + MONTHDAYSTATE months[14] = { 0 }; + + ok(nmstate->cDayState > 0, "got %d\n", nmstate->cDayState); + ok(nmstate->cDayState <= 14, "got %d\n", nmstate->cDayState); + ok(nmstate->prgDayState != NULL, "got %p\n", nmstate->prgDayState); + + nmstate->prgDayState = months; + + return TRUE; + } + default: + break; + } + } + defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--;

1 0

Frédéric Delanoy : cmd: Output error messages to stderr instead of stdout where appropriate.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: aee397a31780dcc98e555b27b4cac8f827c573d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee397a31780dcc98e555b27b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 1 04:15:05 2011 +0200 cmd: Output error messages to stderr instead of stdout where appropriate. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmdmain.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ca0d4fe..0df123a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1124,7 +1124,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Process the input file */ if (input == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), item); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), item); errorlevel = 1; return; /* FOR loop aborts at first failure here */ @@ -1539,7 +1539,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { WCMD_parameter(s, 1, &command, NULL); } else { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 3f2cfcf..eb57928 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1055,7 +1055,7 @@ void WCMD_run_program (WCHAR *command, int called) { if (strchrW(param1, '.') != NULL) extensionsupplied = TRUE; if (strlenW(param1) >= MAX_PATH) { - WCMD_output_asis(WCMD_LoadMessage(WCMD_LINETOOLONG)); + WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_LINETOOLONG)); return; } @@ -1836,9 +1836,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, /* Handle truncated input - issue warning */ if (strlenW(extraSpace) == MAXSTRING -1) { - WCMD_output_asis(WCMD_LoadMessage(WCMD_TRUNCATEDLINE)); - WCMD_output_asis(extraSpace); - WCMD_output_asis(newline); + WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_TRUNCATEDLINE)); + WCMD_output_asis_stderr(extraSpace); + WCMD_output_asis_stderr(newline); } /* Replace env vars if in a batch context */

1 0

Frédéric Delanoy : cmd: Improve WCMD_fgets documentation.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: e3a72698c1ea89f0b6a0d4c1459c339c5a2ed8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a72698c1ea89f0b6a0d4c14… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 1 13:43:17 2011 +0200 cmd: Improve WCMD_fgets documentation. --- programs/cmd/batch.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 447eccd..52dd08e 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -176,9 +176,14 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { /**************************************************************************** * WCMD_fgets * - * Get one line from a batch file/console. We can't use the native f* functions because - * of the filename syntax differences between DOS and Unix. Also need to lose - * the LF (or CRLF) from the line. + * Gets one line from a file/console and puts it into buffer s + * Pre: s has size noChars + * 1 <= noChars <= MAXSTRING + * Post: s is filled with at most noChars-1 characters, and gets nul-terminated + s does not include EOL terminator + * Returns: + * s on success + * NULL on error or EOF */ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) @@ -187,6 +192,9 @@ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) BOOL status; WCHAR *p; + /* We can't use the native f* functions because of the filename syntax differences + between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ + p = s; if (is_console_handle) { status = ReadConsoleW(h, s, noChars, &charsRead, NULL);

1 0

Frédéric Delanoy : cmd: Handle truncation for console reads.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 5e8893f2f6b259a26ed5bfb7e3b4ea4580145445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e8893f2f6b259a26ed5bfb7e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 1 13:43:18 2011 +0200 cmd: Handle truncation for console reads. --- programs/cmd/batch.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 52dd08e..5f83c35 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -199,7 +199,12 @@ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) if (is_console_handle) { status = ReadConsoleW(h, s, noChars, &charsRead, NULL); if (!status) return NULL; - s[charsRead-2] = '\0'; /* Strip \r\n */ + if (s[charsRead-2] == '\r') + s[charsRead-2] = '\0'; /* Strip \r\n */ + else { + /* Truncate */ + s[noChars-1] = '\0'; + } return p; }

1 0

Huw Davies : winex11: Remove some unused function ptrs.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: ea3895e133854620012ac5829f32edcbed040346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3895e133854620012ac5829… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Oct 2 15:01:06 2011 +0100 winex11: Remove some unused function ptrs. --- dlls/winex11.drv/xrender.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e37ddc2..de469e2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -188,9 +188,6 @@ static void *xrender_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f; MAKE_FUNCPTR(XRenderAddGlyphs) MAKE_FUNCPTR(XRenderComposite) -MAKE_FUNCPTR(XRenderCompositeString8) -MAKE_FUNCPTR(XRenderCompositeString16) -MAKE_FUNCPTR(XRenderCompositeString32) MAKE_FUNCPTR(XRenderCompositeText16) MAKE_FUNCPTR(XRenderCreateGlyphSet) MAKE_FUNCPTR(XRenderCreatePicture) @@ -365,9 +362,6 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) goto sym_not_found; LOAD_FUNCPTR(XRenderAddGlyphs) LOAD_FUNCPTR(XRenderComposite) -LOAD_FUNCPTR(XRenderCompositeString8) -LOAD_FUNCPTR(XRenderCompositeString16) -LOAD_FUNCPTR(XRenderCompositeString32) LOAD_FUNCPTR(XRenderCompositeText16) LOAD_FUNCPTR(XRenderCreateGlyphSet) LOAD_FUNCPTR(XRenderCreatePicture)

1 0