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

Alexandre Julliard : gdi32: Add a priority mechanism for pushing drivers on the stack in a defined order .
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: e94d3b4e0897d6c744595941bcfd724bdd47d3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94d3b4e0897d6c744595941b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 12:16:05 2012 +0200 gdi32: Add a priority mechanism for pushing drivers on the stack in a defined order. --- dlls/gdi32/bitmap.c | 15 ++++----------- dlls/gdi32/dc.c | 3 ++- dlls/gdi32/dib.c | 7 ++----- dlls/gdi32/dibdrv/dc.c | 2 ++ dlls/gdi32/driver.c | 2 ++ dlls/gdi32/enhmfdrv/init.c | 15 ++++++++++++++- dlls/gdi32/freetype.c | 14 +++++++++++++- dlls/gdi32/gdi_private.h | 9 +++++++++ dlls/gdi32/mfdrv/init.c | 15 ++++++++++++++- dlls/gdi32/path.c | 18 ++++++++++++++---- dlls/wineps.drv/init.c | 14 +++++++++++++- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 14 +++++++++++++- include/wine/gdi_driver.h | 21 +++++++++++---------- 14 files changed, 114 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e94d3b4e0897d6c744595…

1 0

Dylan Smith : richedit: Remove always FALSE parameter from ME_PaintContent.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 18fa3287f647ea1e123641ee04447a7132c6a7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18fa3287f647ea1e123641ee0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 7 22:11:55 2012 -0400 richedit: Remove always FALSE parameter from ME_PaintContent. --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 28 ++++++++-------------------- dlls/riched20/wrap.c | 1 + 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f3764df..e61aac4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4463,7 +4463,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ps.rcPaint.right = editor->rcFormat.right; } - ME_PaintContent(editor, hDC, FALSE, &ps.rcPaint); + ME_PaintContent(editor, hDC, &ps.rcPaint); EndPaint(editor->hWnd, &ps); return 0; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8cded51..7a56b1a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -207,7 +207,7 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; /* paint.c */ -void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *rcUpdate) DECLSPEC_HIDDEN; +void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLSPEC_HIDDEN; void ME_Repaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_RewrapRepaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e1f838e..18b2da4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph); -void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *rcUpdate) +void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) { ME_DisplayItem *item; ME_Context c; @@ -71,17 +71,14 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * ys -= item->member.para.pCell->member.cell.yTextOffset; } - if (!bOnlyNew || (item->member.para.nFlags & MEPF_REPAINT)) + /* Draw the paragraph if any of the paragraph is in the update region. */ + if (ys < rcUpdate->bottom && ye > rcUpdate->top) { - /* Draw the paragraph if any of the paragraph is in the update region. */ - if (ys < rcUpdate->bottom && ye > rcUpdate->top) - { - ME_DrawParagraph(&c, item); - /* Clear the repaint flag if the whole paragraph is in the - * update region. */ - if (rcUpdate->top <= ys && rcUpdate->bottom >= ye) - item->member.para.nFlags &= ~MEPF_REPAINT; - } + ME_DrawParagraph(&c, item); + /* Clear the repaint flag if the whole paragraph is in the + * update region. */ + if (rcUpdate->top <= ys && rcUpdate->bottom >= ye) + item->member.para.nFlags &= ~MEPF_REPAINT; } item = item->member.para.next_para; } @@ -94,15 +91,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * rc.bottom = c.rcView.bottom; rc.right = c.rcView.right; - if (bOnlyNew) - { - /* Only erase region drawn from previous call to ME_PaintContent */ - if (editor->nTotalLength < editor->nLastTotalLength) - rc.bottom = c.pt.y + editor->nLastTotalLength; - else - SetRectEmpty(&rc); - } - IntersectRect(&rc, &rc, rcUpdate); if (!IsRectEmpty(&rc)) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index cca2cb1..2d19119 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -753,6 +753,7 @@ void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) + item->member.para.nHeight - ofs, c.rcView.bottom); ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); + item->member.para.nFlags &= ~MEPF_REPAINT; } item = item->member.para.next_para; }

1 0

Nikolay Sivov : msxml3: Add a helper to check that lexical handler is set.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: fc4dab4c3ba8007f1ab6e1e2e986a8d95c633e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4dab4c3ba8007f1ab6e1e2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 15:56:20 2012 +0400 msxml3: Add a helper to check that lexical handler is set. --- dlls/msxml3/saxreader.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0d46c4f..b3b6fc4 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -319,7 +319,13 @@ static inline int has_content_handler(const saxlocator *locator) (!locator->vbInterface && locator->saxreader->contentHandler); } -static inline BOOL has_error_handler(const saxlocator *locator) +static inline int has_lexical_handler(const saxlocator *locator) +{ + return (locator->vbInterface && locator->saxreader->vblexicalHandler) || + (!locator->vbInterface && locator->saxreader->lexicalHandler); +} + +static inline int has_error_handler(const saxlocator *locator) { return (locator->vbInterface && locator->saxreader->vberrorHandler) || (!locator->vbInterface && locator->saxreader->errorHandler); @@ -1587,8 +1593,7 @@ static void libxmlComment(void *ctx, const xmlChar *value) for(; p>=This->pParserCtxt->input->base && *p!='\n' && *p!='\r'; p--) This->column++; - if(!This->vbInterface && !This->saxreader->lexicalHandler) return; - if(This->vbInterface && !This->saxreader->vblexicalHandler) return; + if (!has_lexical_handler(This)) return; bValue = pooled_bstr_from_xmlChar(&This->saxreader->pool, value); @@ -1678,10 +1683,13 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) for(; beg>=This->pParserCtxt->input->base && *beg!='\n' && *beg!='\r'; beg--) This->column++; - if(This->vbInterface && This->saxreader->vblexicalHandler) - hr = IVBSAXLexicalHandler_startCDATA(This->saxreader->vblexicalHandler); - if(!This->vbInterface && This->saxreader->lexicalHandler) - hr = ISAXLexicalHandler_startCDATA(This->saxreader->lexicalHandler); + if (has_lexical_handler(This)) + { + if (This->vbInterface) + hr = IVBSAXLexicalHandler_startCDATA(This->saxreader->vblexicalHandler); + else + hr = ISAXLexicalHandler_startCDATA(This->saxreader->lexicalHandler); + } if(FAILED(hr)) { @@ -1731,10 +1739,13 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) cur = end; } - if(This->vbInterface && This->saxreader->vblexicalHandler) - hr = IVBSAXLexicalHandler_endCDATA(This->saxreader->vblexicalHandler); - if(!This->vbInterface && This->saxreader->lexicalHandler) - hr = ISAXLexicalHandler_endCDATA(This->saxreader->lexicalHandler); + if (has_lexical_handler(This)) + { + if (This->vbInterface) + hr = IVBSAXLexicalHandler_endCDATA(This->saxreader->vblexicalHandler); + else + hr = ISAXLexicalHandler_endCDATA(This->saxreader->lexicalHandler); + } if(FAILED(hr)) format_error_message_from_id(This, hr);

1 0

Alexandre Julliard : winex11: Implement wglGetPbufferDCARB with a DC escape and remove it from the GDI driver interface .
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 147174ff1ca864a3d275d12290aac4c427b5140d URL: http://source.winehq.org/git/wine.git/?a=commit;h=147174ff1ca864a3d275d1229… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 12:35:13 2012 +0200 winex11: Implement wglGetPbufferDCARB with a DC escape and remove it from the GDI driver interface. --- dlls/gdi32/dibdrv/dc.c | 10 ---------- dlls/gdi32/driver.c | 6 ------ dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/freetype.c | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/gdi32/opengl.c | 30 ------------------------------ dlls/gdi32/path.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 10 ---------- dlls/winex11.drv/opengl.c | 38 ++++++++++++++++++++------------------ dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 3 +-- 12 files changed, 21 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=147174ff1ca864a3d275d…

1 0

Alexandre Julliard : gdi32: Allow a driver to implement SelectBitmap but not CreateBitmap.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: eb80e6f2dbf89cb15c2b9086af55714a54cf6c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb80e6f2dbf89cb15c2b9086a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 14:32:23 2012 +0200 gdi32: Allow a driver to implement SelectBitmap but not CreateBitmap. --- dlls/gdi32/bitmap.c | 73 +++++++++++++++++--------------------------------- 1 files changed, 25 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index acb0575..bcc2932 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -493,49 +493,6 @@ static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) } } -/*********************************************************************** - * BITMAP_SetOwnerDC - * - * Set the type of DC that owns the bitmap. This is used when the - * bitmap is selected into a device to initialize the bitmap function - * table. - */ -static BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) -{ - BITMAPOBJ *bitmap; - BOOL ret = TRUE; - - /* never set the owner of the stock bitmap since it can be selected in multiple DCs */ - if (hbitmap == GetStockObject(DEFAULT_BITMAP)) return TRUE; - - if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return FALSE; - - if (bitmap->funcs != physdev->funcs) - { - /* we can only change from the null driver to some other driver */ - if (bitmap->funcs == &null_driver) - { - if (physdev->funcs->pCreateBitmap) - { - ret = physdev->funcs->pCreateBitmap( physdev, hbitmap ); - if (ret) - { - bitmap->funcs = physdev->funcs; - set_initial_bitmap_bits( hbitmap, bitmap ); - } - } - else bitmap->funcs = &dib_driver; /* use the DIB driver to emulate DDB support */ - } - else - { - FIXME( "Trying to select bitmap %p in different DC type\n", hbitmap ); - ret = FALSE; - } - } - GDI_ReleaseObj( hbitmap ); - return ret; -} - /*********************************************************************** * BITMAP_SelectObject @@ -545,7 +502,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) HGDIOBJ ret; BITMAPOBJ *bitmap; DC *dc; - PHYSDEV physdev = NULL, old_physdev = NULL; + PHYSDEV physdev = NULL, old_physdev = NULL, createdev; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -574,6 +531,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) if (dc->dibdrv) old_physdev = pop_dc_driver( dc, dc->dibdrv ); physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + createdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); if (physdev->funcs == &null_driver) { physdev = dc->dibdrv; @@ -585,12 +543,31 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) } } - if (!BITMAP_SetOwnerDC( handle, physdev )) + /* never set the owner of the stock bitmap since it can be selected in multiple DCs */ + if (handle != GetStockObject(DEFAULT_BITMAP) && bitmap->funcs != createdev->funcs) { - GDI_ReleaseObj( handle ); - ret = 0; - goto done; + /* we can only change from the null driver to some other driver */ + if (bitmap->funcs != &null_driver) + { + FIXME( "Trying to select bitmap %p in different DC type\n", handle ); + GDI_ReleaseObj( handle ); + ret = 0; + goto done; + } + if (createdev->funcs != &null_driver) + { + if (!createdev->funcs->pCreateBitmap( createdev, handle )) + { + GDI_ReleaseObj( handle ); + ret = 0; + goto done; + } + bitmap->funcs = createdev->funcs; + set_initial_bitmap_bits( handle, bitmap ); + } + else bitmap->funcs = &dib_driver; /* use the DIB driver to emulate DDB support */ } + if (!physdev->funcs->pSelectBitmap( physdev, handle )) { GDI_ReleaseObj( handle );

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: c4b404c7afbcff1fb2bbf8257dcbef75d1a4942b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b404c7afbcff1fb2bbf8257… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 7 11:13:09 2012 +0900 po: Update Korean translation. --- po/ko.po | 55 ++++++++++++------------------------------------------- 1 files changed, 12 insertions(+), 43 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0607251..aeb56f2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6627,37 +6627,6 @@ msgid "insert disk %s" msgstr "디스크 %s 삽입" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -6689,27 +6658,27 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" +"윈도우즈 설치 프로그램 %s\n" "\n" "사용법:\n" "msiexec 명령 {필수 매개변수} [선택적 매개변수]\n" "\n" "제품 설치:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" +"\t/i {패키지|제품코드} [속성}\n" +"\t/package {패키지|제품코드} [속성]\n" +"\t/a package [속성]\n" "설치 복구:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" +"\t/f[p|o|e|d|c|a|u|m|s|v] {패키지|제품코드}\n" "제품 제거:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" +"\t/uninstall {제품|제품코드} [속성]\n" +"\t/x {제품|제품코드} [속성]\n" "제품 알리기:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" +"\t/j[u|m] 패키지 [/t 변환] [/g 언어아이디]\n" "패치 추가:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"위의 명령어를 위한 Log 와 UI 한정자:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" +"\t/p 패치할 패키지 [속성]\n" +"\t/p 패치할 패키지 /a 패키지 [속성]\n" +"위의 명령어를 위한 사용자 인터페이스 한정자:\n" +"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 로그파일\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" "MSI 서비스 등록:\n" "\t/y\n"

1 0

Dmitry Timoshkov : gdi32: Add a test for ntmCellHeight calculation.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: ab7fe6086e33142eaa04b3c185e9c29b55ca3f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7fe6086e33142eaa04b3c18… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 8 19:29:02 2012 +0900 gdi32: Add a test for ntmCellHeight calculation. --- dlls/gdi32/tests/font.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 1708c49..f50d1bc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2842,7 +2842,7 @@ out: return r; } -static void test_text_metrics(const LOGFONTA *lf) +static void test_text_metrics(const LOGFONT *lf, const NEWTEXTMETRIC *ntm) { HDC hdc; HFONT hfont, hfont_old; @@ -2851,6 +2851,7 @@ static void test_text_metrics(const LOGFONTA *lf) LONG size, ret; const char *font_name = lf->lfFaceName; DWORD cmap_first = 0, cmap_last = 0; + UINT ascent, descent, cell_height; cmap_type cmap_type; BOOL sys_lang_non_english; @@ -2879,6 +2880,12 @@ static void test_text_metrics(const LOGFONTA *lf) ret = GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size); ok(ret == size, "GetFontData should return %u not %u\n", size, ret); + ascent = GET_BE_WORD(tt_os2.usWinAscent); + descent = GET_BE_WORD(tt_os2.usWinDescent); + cell_height = ascent + descent; + ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", + font_name, ntm->ntmCellHeight, cell_height, ascent, descent); + SetLastError(0xdeadbeef); ret = GetTextMetricsA(hdc, &tmA); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); @@ -3067,7 +3074,7 @@ static INT CALLBACK enum_truetype_font_proc(const LOGFONT *lf, const TEXTMETRIC if (type == TRUETYPE_FONTTYPE) { (*enumed)++; - test_text_metrics(lf); + test_text_metrics(lf, (const NEWTEXTMETRIC *)ntm); } return 1; }

1 0

Józef Kucia : d3dx9/tests: Use consistent naming for DDS defines.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: ecb1c602f4f50c066ca86cb88b3b6f89e0d62401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb1c602f4f50c066ca86cb88… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon May 7 22:29:06 2012 +0200 d3dx9/tests: Use consistent naming for DDS defines. --- dlls/d3dx9_36/tests/surface.c | 62 ++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 2138e45..981d480 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -143,13 +143,13 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons #define DDS_WIDTH 0x00000004 #define DDS_PIXELFORMAT 0x00001000 -#define DDSCAPS_TEXTURE 0x00001000 +#define DDS_CAPS_TEXTURE 0x00001000 -#define DDSPF_ALPHAPIXELS 0x00000001 -#define DDSPF_ALPHA 0x00000002 -#define DDSPF_FOURCC 0x00000004 -#define DDSPF_RGB 0x00000040 -#define DDSPF_LUMINANCE 0x00020000 +#define DDS_PF_ALPHA 0x00000001 +#define DDS_PF_ALPHA_ONLY 0x00000002 +#define DDS_PF_FOURCC 0x00000004 +#define DDS_PF_RGB 0x00000040 +#define DDS_PF_LUMINANCE 0x00020000 static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, @@ -196,7 +196,7 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, dds.pixel_format.gmask = gmask; dds.pixel_format.bmask = bmask; dds.pixel_format.amask = amask; - dds.caps = DDSCAPS_TEXTURE; + dds.caps = DDS_CAPS_TEXTURE; hr = D3DXGetImageInfoFromFileInMemory(&dds, sizeof(dds), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n", hr, expected_format, D3D_OK); @@ -375,30 +375,30 @@ static void test_D3DXGetImageInfo(void) ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); } else skip("Couldn't get image info from volume map in memory\n"); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0, D3DFMT_DXT1); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','2'), 0, 0, 0, 0, 0, D3DFMT_DXT2); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0, D3DFMT_DXT3); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','4'), 0, 0, 0, 0, 0, D3DFMT_DXT4); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0, D3DFMT_DXT5); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0, D3DFMT_R8G8_B8G8); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0, D3DFMT_G8R8_G8B8); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('U','Y','V','Y'), 0, 0, 0, 0, 0, D3DFMT_UYVY); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('Y','U','Y','2'), 0, 0, 0, 0, 0, D3DFMT_YUY2); - check_dds_pixel_format(DDSPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0, D3DFMT_R5G6B5); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000, D3DFMT_A1R5G5B5); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000, D3DFMT_A4R4G4B4); - check_dds_pixel_format(DDSPF_RGB, 0, 8, 0xe0, 0x1c, 0x03, 0, D3DFMT_R3G3B2); - check_dds_pixel_format(DDSPF_ALPHA, 0, 8, 0, 0, 0, 0xff, D3DFMT_A8); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 16, 0x00e0, 0x001c, 0x0003, 0xff00, D3DFMT_A8R3G3B2); - check_dds_pixel_format(DDSPF_RGB, 0, 16, 0xf00, 0x0f0, 0x00f, 0, D3DFMT_X4R4G4B4); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, D3DFMT_A8R8G8B8); - check_dds_pixel_format(DDSPF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, D3DFMT_X8R8G8B8); - check_dds_pixel_format(DDSPF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_G16R16); - check_dds_pixel_format(DDSPF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, D3DFMT_L8); - check_dds_pixel_format(DDSPF_LUMINANCE | DDSPF_ALPHAPIXELS, 0, 16, 0x00ff, 0, 0, 0xff00, D3DFMT_A8L8); - check_dds_pixel_format(DDSPF_LUMINANCE | DDSPF_ALPHAPIXELS, 0, 8, 0x0f, 0, 0, 0xf0, D3DFMT_A4L4); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0, D3DFMT_DXT1); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','2'), 0, 0, 0, 0, 0, D3DFMT_DXT2); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0, D3DFMT_DXT3); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','4'), 0, 0, 0, 0, 0, D3DFMT_DXT4); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0, D3DFMT_DXT5); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0, D3DFMT_R8G8_B8G8); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0, D3DFMT_G8R8_G8B8); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('U','Y','V','Y'), 0, 0, 0, 0, 0, D3DFMT_UYVY); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('Y','U','Y','2'), 0, 0, 0, 0, 0, D3DFMT_YUY2); + check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0, D3DFMT_R5G6B5); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000, D3DFMT_A1R5G5B5); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000, D3DFMT_A4R4G4B4); + check_dds_pixel_format(DDS_PF_RGB, 0, 8, 0xe0, 0x1c, 0x03, 0, D3DFMT_R3G3B2); + check_dds_pixel_format(DDS_PF_ALPHA_ONLY, 0, 8, 0, 0, 0, 0xff, D3DFMT_A8); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x00e0, 0x001c, 0x0003, 0xff00, D3DFMT_A8R3G3B2); + check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf00, 0x0f0, 0x00f, 0, D3DFMT_X4R4G4B4); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, D3DFMT_A8R8G8B8); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, D3DFMT_X8R8G8B8); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_G16R16); + check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, D3DFMT_L8); + check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 16, 0x00ff, 0, 0, 0xff00, D3DFMT_A8L8); + check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 8, 0x0f, 0, 0, 0xf0, D3DFMT_A4L4); todo_wine { hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info);

1 0

Nikolay Sivov : shell32: Implement IShellDispatch2::IsServiceRunning().
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 9af543aad8ff50ba0e5ad7a1803b6608433a3717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af543aad8ff50ba0e5ad7a18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 7 13:42:27 2012 +0400 shell32: Implement IShellDispatch2::IsServiceRunning(). --- dlls/shell32/shelldispatch.c | 45 ++++++++++++++++++++++++-- dlls/shell32/tests/shelldispatch.c | 61 ++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 29298b3..825c405 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "winsvc.h" #include "shlwapi.h" #include "shlobj.h" #include "shldisp.h" @@ -1038,10 +1039,48 @@ static HRESULT WINAPI ShellDispatch_ServiceStop(IShellDispatch2 *iface, BSTR ser return E_NOTIMPL; } -static HRESULT WINAPI ShellDispatch_IsServiceRunning(IShellDispatch2 *iface, BSTR service, VARIANT *running) +static HRESULT WINAPI ShellDispatch_IsServiceRunning(IShellDispatch2 *iface, BSTR name, VARIANT *running) { - FIXME("(%s, %p): stub\n", debugstr_w(service), running); - return E_NOTIMPL; + SERVICE_STATUS_PROCESS status; + SC_HANDLE scm, service; + DWORD dummy; + + TRACE("(%s, %p)\n", debugstr_w(name), running); + + V_VT(running) = VT_BOOL; + V_BOOL(running) = VARIANT_FALSE; + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (!scm) + { + ERR("failed to connect to service manager\n"); + return S_OK; + } + + service = OpenServiceW(scm, name, SERVICE_QUERY_STATUS); + if (!service) + { + ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); + CloseServiceHandle(service); + return S_OK; + } + + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, + sizeof(SERVICE_STATUS_PROCESS), &dummy)) + { + TRACE("failed to query service status (%u)\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(scm); + return S_OK; + } + + if (status.dwCurrentState == SERVICE_RUNNING) + V_BOOL(running) = VARIANT_TRUE; + + CloseServiceHandle(service); + CloseServiceHandle(scm); + + return S_OK; } static HRESULT WINAPI ShellDispatch_CanStartStopService(IShellDispatch2 *iface, BSTR service, VARIANT *ret) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 2ccc364..307e0fc 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -27,6 +27,9 @@ #include "shlwapi.h" #include "wine/test.h" +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + static HRESULT (WINAPI *pSHGetFolderPathW)(HWND, int, HANDLE, DWORD, LPWSTR); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); @@ -303,6 +306,63 @@ static void test_namespace(void) IShellDispatch_Release(sd); } +static void test_service(void) +{ + static const WCHAR spooler[] = {'S','p','o','o','l','e','r',0}; + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + SERVICE_STATUS_PROCESS status; + SC_HANDLE scm, service; + IShellDispatch2 *sd; + DWORD dummy; + HRESULT hr; + BSTR name; + VARIANT v; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch2, (void**)&sd); + if (hr != S_OK) + { + win_skip("IShellDispatch2 not supported\n"); + return; + } + + V_VT(&v) = VT_I2; + V_I2(&v) = 10; + hr = IShellDispatch2_IsServiceRunning(sd, NULL, &v); + ok(V_VT(&v) == VT_BOOL, "got %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); + EXPECT_HR(hr, S_OK); + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + service = OpenServiceW(scm, spooler, SERVICE_QUERY_STATUS); + QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy); + CloseServiceHandle(service); + CloseServiceHandle(scm); + + /* service should exist */ + name = SysAllocString(spooler); + V_VT(&v) = VT_I2; + hr = IShellDispatch2_IsServiceRunning(sd, name, &v); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BOOL, "got %d\n", V_VT(&v)); + if (status.dwCurrentState == SERVICE_RUNNING) + ok(V_BOOL(&v) == VARIANT_TRUE, "got %d\n", V_BOOL(&v)); + else + ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); + SysFreeString(name); + + /* service doesn't exist */ + name = SysAllocString(dummyW); + V_VT(&v) = VT_I2; + hr = IShellDispatch2_IsServiceRunning(sd, name, &v); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BOOL, "got %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); + SysFreeString(name); + + IShellDispatch_Release(sd); +} + START_TEST(shelldispatch) { HRESULT r; @@ -314,6 +374,7 @@ START_TEST(shelldispatch) init_function_pointers(); test_namespace(); + test_service(); CoUninitialize(); }

1 0

Detlef Riekenberg : devenum: Remove tabs and duplicate newlines from TRACE.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 25cf21bddcd660dd65f5109487d2a2d2300a2b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25cf21bddcd660dd65f510948… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 7 21:21:24 2012 +0200 devenum: Remove tabs and duplicate newlines from TRACE. --- dlls/devenum/createdevenum.c | 5 ++--- dlls/devenum/factory.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index f4e8727..4a2e101 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -62,7 +62,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void); static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(ICreateDevEnum *iface, REFIID riid, void **ppv) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_POINTER; @@ -463,8 +463,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( HKEY hbasekey; HRESULT hr; - TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", iface, debugstr_guid(clsidDeviceClass), - ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); + TRACE("(%p)->(%s, %p, %x)\n", iface, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags); if (!ppEnumMoniker) return E_POINTER; diff --git a/dlls/devenum/factory.c b/dlls/devenum/factory.c index 215eb3a..c808fa5 100644 --- a/dlls/devenum/factory.c +++ b/dlls/devenum/factory.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); if (ppvObj == NULL) return E_POINTER; @@ -81,7 +81,7 @@ static ULONG WINAPI DEVENUM_IClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("(%p)->(%p, %s, %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppvObj); if (ppvObj == NULL) return E_POINTER;

1 0