Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[akhaldi] 75880: [INETCOMM] Sync with Wine Staging 2.16. CORE-13762 fe6367a inetcomm: Implemented IMimeBody::GetClassID(). 5557081 inetcomm: Release previously set data (Valgrind).
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:12 2017 New Revision: 75880 URL: http://svn.reactos.org/svn/reactos?rev=75880&view=rev Log: [INETCOMM] Sync with Wine Staging 2.16. CORE-13762 fe6367a inetcomm: Implemented IMimeBody::GetClassID(). 5557081 inetcomm: Release previously set data (Valgrind). Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] Sun Sep 17 22:54:12 2017 @@ -954,10 +954,15 @@ CLSID* pClassID) { MimeBody *This = impl_from_IMimeBody(iface); - FIXME("(%p)->(%p) stub\n", This, pClassID); - return E_NOTIMPL; -} - + + TRACE("(%p)->(%p)\n", This, pClassID); + + if(!pClassID) + return E_INVALIDARG; + + *pClassID = IID_IMimeBody; + return S_OK; +} static HRESULT WINAPI MimeBody_IsDirty( IMimeBody* iface) @@ -1738,7 +1743,7 @@ } if(This->data) - FIXME("release old data\n"); + release_data(&This->data_iid, This->data); This->data_iid = *riid; This->data = pvObject; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:54:12 2017 @@ -78,7 +78,7 @@ reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16 reactos/dll/win32/imagehlp # Synced to WineStaging-2.9 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 -reactos/dll/win32/inetcomm # Synced to WineStaging-2.9 +reactos/dll/win32/inetcomm # Synced to WineStaging-2.16 reactos/dll/win32/inetmib1 # Synced to WineStaging-2.9 reactos/dll/win32/initpki # Synced to WineStaging-2.9 reactos/dll/win32/inseng # Synced to WineStaging-2.9

1 0

[akhaldi] 75879: [IMAADP32.ACM] Sync with Wine Staging 2.16. CORE-13762 0f0fb98 imaadp32.acm: Fix nibble ordering. 2a1c1a4 imaadp32.acm: Fix block size calculations.
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:07 2017 New Revision: 75879 URL: http://svn.reactos.org/svn/reactos?rev=75879&view=rev Log: [IMAADP32.ACM] Sync with Wine Staging 2.16. CORE-13762 0f0fb98 imaadp32.acm: Fix nibble ordering. 2a1c1a4 imaadp32.acm: Fix block size calculations. Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] Sun Sep 17 22:54:07 2017 @@ -156,7 +156,7 @@ } pwfx->cbSize = sizeof(WORD); - awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels) * 2) / pwfx->nChannels + 1; + awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels)) * (2 / pwfx->nChannels) + 1; pwfx->nAvgBytesPerSec = (pwfx->nSamplesPerSec * pwfx->nBlockAlign) / awfx->wSamplesPerBlock; } @@ -447,7 +447,7 @@ &stepIndexL, &sampleL); code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } for (i = 0; i < 4; i++) { @@ -455,7 +455,7 @@ &stepIndexR, &sampleR); code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } src += 32; } @@ -511,7 +511,7 @@ src += 2; code2 = generate_nibble(R16(src), &stepIndex, &sample); src += 2; - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } dst = in_dst + adsi->pwfxDst->nBlockAlign; } @@ -633,14 +633,7 @@ afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ADPCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ADPCM_Formats[afd->dwFormatIndex].nBits; - afd->pwfx->nBlockAlign = 1024; - /* we got 4 bits per sample */ - afd->pwfx->nAvgBytesPerSec = - (afd->pwfx->nSamplesPerSec * 4) / 8; - if (afd->cbwfx >= sizeof(WAVEFORMATEX)) - afd->pwfx->cbSize = sizeof(WORD); - if (afd->cbwfx >= sizeof(IMAADPCMWAVEFORMAT)) - ((IMAADPCMWAVEFORMAT*)afd->pwfx)->wSamplesPerBlock = (1024 - 4 * afd->pwfx->nChannels) * (2 / afd->pwfx->nChannels) + 1; + init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT *)afd->pwfx); break; default: WARN("Unsupported tag %08x\n", afd->dwFormatTag); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:54:07 2017 @@ -75,7 +75,7 @@ reactos/dll/win32/httpapi # Synced to WineStaging-2.9 reactos/dll/win32/iccvid # Synced to WineStaging-2.9 reactos/dll/win32/ieframe # Synced to WineStaging-2.9 -reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.9 +reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16 reactos/dll/win32/imagehlp # Synced to WineStaging-2.9 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to WineStaging-2.9

1 0

[akhaldi] 75878: [COMCTL32] Addendum to r75862. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:01 2017 New Revision: 75878 URL: http://svn.reactos.org/svn/reactos?rev=75878&view=rev Log: [COMCTL32] Addendum to r75862. CORE-13762 Modified: trunk/reactos/dll/win32/comctl32/idc_copy.cur trunk/reactos/dll/win32/comctl32/idc_divider.cur trunk/reactos/dll/win32/comctl32/idc_divideropen.cur trunk/reactos/dll/win32/comctl32/idc_movebutton.cur trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/idc_copy.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_cop… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idc_divider.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_div… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idc_divideropen.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_div… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idc_movebutton.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_mov… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Sun Sep 17 22:54:01 2017 @@ -2221,9 +2221,8 @@ SelectObject(hdc, hOldFont); } else - { - LISTVIEW_DrawFocusRect(infoPtr, hdc); - } + LISTVIEW_InvalidateItem(infoPtr, infoPtr->nFocusedItem); + done: ReleaseDC(infoPtr->hwndSelf, hdc); } Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sun Sep 17 22:54:01 2017 @@ -1867,14 +1867,22 @@ if( bWrap ) { if ( !(btnPtr->fsStyle & BTNS_SEP) ) +#ifdef __REACTOS__ y += cy + infoPtr->szSpacing.cy; +#else + y += cy; +#endif else { if ( !(infoPtr->dwStyle & CCS_VERT)) y += cy + ( (btnPtr->cx > 0 ) ? btnPtr->cx : SEPARATOR_WIDTH) * 2 /3; else +#ifdef __REACTOS__ y += cy + infoPtr->szSpacing.cy; +#else + y += cy; +#endif /* nSepRows is used to calculate the extra height following */ /* the last row. */ @@ -1888,7 +1896,11 @@ nRows++; } else +#ifdef __REACTOS__ x += cx + infoPtr->szSpacing.cx; +#else + x += cx; +#endif } /* infoPtr->nRows is the number of rows on the toolbar */ @@ -4485,7 +4497,7 @@ short width = (short)LOWORD(lParam); short height = (short)HIWORD(lParam); - TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", infoPtr->hwndSelf, wParam, lParam); + TRACE("hwnd=%p, wParam=%ld, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height); if (wParam != 0) FIXME("wParam is %ld. Perhaps image list index?\n", wParam);

1 0

[ekohl] 75877: desk.cpl: Improve Japanese translation Patch by Katayama Hirofumi MZ. CORE-13784
by ekohl＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: ekohl Date: Sun Sep 17 22:50:06 2017 New Revision: 75877 URL: http://svn.reactos.org/svn/reactos?rev=75877&view=rev Log: desk.cpl: Improve Japanese translation Patch by Katayama Hirofumi MZ. CORE-13784 Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Sun Sep 17 22:50:06 2017 @@ -43,13 +43,13 @@ FONT 9, "MS UI Gothic" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Visual Style", IDC_STATIC, 7, 130, 104, 9 + LTEXT "è¦è¦ã¹ã¿ã¤ã«", IDC_STATIC, 7, 130, 104, 9 COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "éè²", IDC_STATIC, 7, 160, 104, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Size", IDC_STATIC, 7, 190, 104, 9 + LTEXT "ãµã¤ãº", IDC_STATIC, 7, 190, 104, 9 COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "å¹æ(&E)...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 @@ -152,13 +152,13 @@ IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Display Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 +CAPTION "ãã£ã¹ãã¬ã¤è¨å®" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ãã®ãã£ã¹ãã¬ã¤è¨å®ãä¿åãã¾ããï¼", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 - PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 - DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 + PUSHBUTTON "ã¯ã(&Y)", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "ããã(&N)", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -232,7 +232,7 @@ IDS_MESSBOX "ã¡ãã»ã¼ã¸ ããã¯ã¹" IDS_MESSTEXT "ã¡ãã»ã¼ã¸ ããã¹ã" IDS_BUTTEXT "OK" - IDS_CLASSIC_THEME "Classic Theme" + IDS_CLASSIC_THEME "ã¯ã©ã·ãã¯ ãã¼ã" END STRINGTABLE @@ -263,5 +263,5 @@ IDS_DISPLAY_SETTINGS "è¡¨ç¤ºè¨å®" IDS_APPLY_FAILED "æ°ããè¨å®ã®é©ç¨ã«å¤±æãã¾ãã..." IDS_APPLY_NEEDS_RESTART "å¤æ´ãåæ ããã«ã¯ã³ã³ãã¥ã¼ã¿ãåèµ·åããå¿è¦ãããã¾ãã" - IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." -END + IDS_TIMEOUTTEXT "%d ç§å¾ã«ä»¥åã®è¨å®ã«æ»ãã¾ãã" +END

1 0

[ekohl] 75876: devmgr: Japanese translation Patch by Katayama Hirofumi MZ. CORE-13783
by ekohl＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: ekohl Date: Sun Sep 17 22:41:08 2017 New Revision: 75876 URL: http://svn.reactos.org/svn/reactos?rev=75876&view=rev Log: devmgr: Japanese translation Patch by Katayama Hirofumi MZ. CORE-13783 Added: trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc (with props) Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] Sun Sep 17 22:41:08 2017 @@ -57,6 +57,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif Added: trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc [iso-8859-1] Sun Sep 17 22:41:08 2017 @@ -0,0 +1,320 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_NAME "åå" + IDS_TYPE "ç¨®é¡" + IDS_MANUFACTURER "è£½é å: %1" + IDS_LOCATION "å°å: %1" + IDS_STATUS "ããã¤ã¹ã®ç¶æ: %1" + IDS_UNKNOWN "ä¸æ" + IDS_LOCATIONSTR "å°å %1!u! (%2)" + IDS_DEVCODE " (ã³ã¼ã %1!u!)" + IDS_DEVCODE2 " (ã³ã¼ã %2!u!)" + IDS_ENABLEDEVICE "ãã®ããã¤ã¹ãä½¿ã (æå¹)" + IDS_DISABLEDEVICE "ãã®ããã¤ã¹ãä½¿ããªã (ç¡å¹)" + IDS_UNKNOWNDEVICE "æªç¥ã®ããã¤ã¹" + IDS_NODRIVERLOADED "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEVONPARENT "on %1" + IDS_TROUBLESHOOTDEV "åé¡ç©¶æ(&T)..." + IDS_ENABLEDEV "ããã¤ã¹ãæå¹ã«ãã(&N)" + IDS_REINSTALLDRV "ãã©ã¤ããåã¤ã³ã¹ãã¼ã«ãã(&I)" + IDS_PROPERTIES "ããããã£(&R)" + IDS_UPDATEDRV "ãã©ã¤ããæ´æ°(&P)..." + IDS_REBOOT "ã³ã³ãã¥ã¼ã¿ãåèµ·å(&C)..." + IDS_NOTAVAILABLE "å©ç¨ä¸å¯" + IDS_NOTDIGITALLYSIGNED "ãã¸ã¿ã«ç½²åããã¦ãã¾ãã" + IDS_NODRIVERS "ãã®ããã¤ã¹ã«å¯¾ãã¦ã¯ããã©ã¤ã ãã¡ã¤ã«ã¯ä¸å¿è¦ãèªã¿è¾¼ã¾ãã¦ãã¾ããã" + IDS_RESOURCE_COLUMN "ãªã½ã¼ã¹ã®ç¨®é¡" + IDS_SETTING_COLUMN "ã»ããã£ã³ã°" + IDS_RESOURCE_MEMORY_RANGE "ã¡ã¢ãªã¼ç¯å²" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "I/O ç¯å²" +END + +/* error messages, source: http://www.z123.org/techsupport/medm.htm */ +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "ãã®ããã¤ã¹ã¯ãæ£ããåä½ãã¦ãã¾ãã" + IDS_DEV_NOT_CONFIGURED "ãã®ããã¤ã¹ã¯ãæ£ããæ§æããã¦ãã¾ããã" + IDS_DEV_DEVLOADER_FAILED "ã³ã³ãã¥ã¼ã¿ãï¼ç¨®é¡ã® %1 ãã¹ãå ±åãã¦ãããããReactOS ã¯ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããèªã¿è¾¼ãã¾ããã" + IDS_DEV_DEVLOADER_FAILED2 "ãã®ããã¤ã¹ã«å¯¾ãã %1 ããã¤ã¹ãã¼ãã¼ã¯ãããã¤ã¹ ãã©ã¤ããèªã¿è¾¼ã¿ã§ãã¾ããã§ããã" + IDS_DEV_OUT_OF_MEMORY "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãããããæªãããããªãã®ã·ã¹ãã ã®ã¡ã¢ãªã¼ããªã½ã¼ã¹ãè¶³ããªãããã§ãã" + IDS_DEV_ENTRY_IS_WRONG_TYPE "ãã®ããã¤ã¹ã¯ããã©ã¤ãã®ããã¤ããæªãããã¬ã¸ã¹ããªãæªããããæ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_LACKED_ARBITRATOR "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãReactOS ãã©ã®ããã«æ±ããããããªããªã½ã¼ã¹ãè¦æ±ãã¾ããã" + IDS_DEV_BOOT_CONFIG_CONFLICT "å¥ã®ããã¤ã¹ããã®ããã¤ã¹ãå¿è¦ã¨ãããªã½ã¼ã¹ãä½¿ç¨ä¸ã§ãã" + IDS_DEV_FAILED_FILTER "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãåã¤ã³ã¹ãã¼ã«ãããå¿è¦ãããã¾ãã" + IDS_DEV_DEVLOADER_NOT_FOUND "ããã¤ã¹ãèªã¿è¾¼ããã¡ã¤ã« %1 ã ReactOS ãèªã¿è¾¼ããªãããããã®ããã¤ã¹ã¯æ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_DEVLOADER_NOT_FOUND2 "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããèªã¿è¾¼ããã¡ã¤ã« %1 ãæªãããããã®ããã¤ã¹ã¯æ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_DEVLOADER_NOT_FOUND3 "ããã¤ã¹å¤±æ: ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããå¤æ´ãããã¨ãã¦ãã¾ãããããããæ©è½ããªããã°ããã¼ãã¦ã§ã¢ã®ææ¸ãåç§ãã¦ä¸ããã" + IDS_DEV_INVALID_DATA "ããªãã®ã³ã³ãã¥ã¼ã¿ã®ä¸ã® BIOS ããããã¤ã¹ã«å¯¾ãããªã½ã¼ã¹ãä¸æ£ã«å ±åãã¦ããããããã®ããã¤ã¹ã¯ãæ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_INVALID_DATA2 "ããã¤ã¹ä¸ã® BIOS ããããã¤ã¹ã«å¯¾ãã¦ãªã½ã¼ã¹ãä¸æ£ã«å ±åãã¦ããããããã®ããã¤ã¹ã¯æ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_FAILED_START "ãã®ããã¤ã¹ã¯ãåå¨ããªãããæ£ããåä½ãã¦ããªããããã¹ã¦ã®ãã©ã¤ããã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEV_LIAR "ReactOS ã¯ãã®ããã¤ã¹ã®éå§ãè©¦ã¿ãã®ãããã¾ããããã£ã¦ReactOS ã¯åã³ãã®ããã¤ã¹ã®éå§ãè©¦ã¿ããã¨ã¯ããã¾ããã" + IDS_DEV_NORMAL_CONFLICT "ãã®ããã¤ã¹ã¯ãä½¿ç¨ããããã®æªå²ãå½ã¦ã® %1 ãªã½ã¼ã¹ãè¦ã¤ããã¾ããã" + IDS_DEV_NOT_VERIFIED "ãã®ããã¤ã¹ã¯ãåå¨ããªãããæ£ããåä½ãã¦ããªããããã¹ã¦ã®ãã©ã¤ããã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEV_NEED_RESTART "ãã®ããã¤ã¹ã¯ãããªããã³ã³ãã¥ã¼ã¿ãåèµ·åããã¾ã§æ£ããåä½ã§ãã¾ããã" + IDS_DEV_REENUMERATION "ãã®ããã¤ã¹ã¯ããªã½ã¼ã¹ç«¶åãèµ·ããã¦ãã¾ãã" + IDS_DEV_PARTIAL_LOG_CONF "ReactOS ã¯ããã®ããã¤ã¹ãä½¿ç¨ãããã¹ã¦ã®ãªã½ã¼ã¹ãèå¥ã§ãã¾ããã§ããã" + IDS_DEV_UNKNOWN_RESOURCE "ãã©ã¤ãæå ±ãã¡ã¤ã« %1 ã¯ããã®åããã¤ã¹ããè¦ªããã¤ã¹ã®ææã¾ãã¯èªèããªããªã½ã¼ã¹ãä½¿ããã¨ãä¼ãã¦ãã¾ãã" + IDS_DEV_REINSTALL "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãåã¤ã³ã¹ãã¼ã«ã®å¿è¦ãããã¾ãã" + IDS_DEV_REGISTRY "ããªãã®ã¬ã¸ã¹ããªãæªãã®ããããã¾ããã" + IDS_DEV_WILL_BE_REMOVED "ReactOS ã¯ãã®ããã¤ã¹ãé¤å»ä¸ã§ãã" + IDS_DEV_DISABLED "ãã®ããã¤ã¹ã¯ãéå§ãã¦ãã¾ããã" + IDS_DEV_DISABLED2 "ãã®ããã¤ã¹ã¯ãç¡å¹ã«ãªã£ã¦ãã¾ãã" + IDS_DEV_DEVLOADER_NOT_READY "ãã®ããã¤ã¹ã®ãã¼ãã¼ã¯å¿è¦ãªãã©ã¤ãã¼ãèªã¿è¾¼ã¿ã§ãã¾ããã" + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ + IDS_DEV_DEVICE_NOT_THERE "ãã®ããã¤ã¹ã¯ãåå¨ããªãããæ£ããæ©è½ãã¦ããªãããå¿è¦ãªãã©ã¤ãããã¹ã¦ã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEV_MOVED "ReactOS ã¯ããã®ããã¤ã¹ãã»ããã¢ãããã¦ãã¾ãã" + IDS_DEV_TOO_EARLY "ReactOS ã¯ããã®ããã¤ã¹ãã»ããã¢ãããã¦ãã¾ãã" + IDS_DEV_NO_VALID_LOG_CONF "ReactOS ã¯ããã®ããã¤ã¹ã«å¯¾ãããªã½ã¼ã¹ãæå®ã§ãã¾ããã" + IDS_DEV_FAILED_INSTALL "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEV_HARDWARE_DISABLED "ãã®ããã¤ã¹ã¯ãBIOS ããªã½ã¼ã¹ãæä¾ããªãã£ããããç¡å¹ã«ãªã£ã¦ãã¾ãã" + IDS_DEV_CANT_SHARE_IRQ "ãã®ããã¤ã¹ã¯ãä»ã®ããã¤ã¹ãä½¿ç¨ä¸ã®IRQ (Interrupt Request) ãªã½ã¼ã¹ãä½¿ã£ã¦ãããå±æã§ãã¾ããã\nããªãã¯ãç«¶åããè¨å®ãå¤æ´ããããç«¶åãå¼ãèµ·ããã¦ãããªã¢ã«ã¢ã¼ã ãã©ã¤ããé¤å»ããå¿è¦ãããã¾ãã" + IDS_DEV_FAILED_ADD "%1 ãæ£ããåä½ãã¦ããªãããããã®ããã¤ã¹ã¯ãæ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_DISABLED_SERVICE "ã»ããã¢ãã ãã¡ã¤ã«ããããã©ã¤ãããããã¯ã¼ã¯ã®å ´æã«ã¢ã¯ã»ã¹ã§ããªããããReactOS ã¯ããã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããã¤ã³ã¹ãã¼ã«ã§ãã¾ããã" + IDS_DEV_TRANSLATION_FAILED "ãã®ããã¤ã¹ã¯ããã®ãã©ã¤ãã«å¿çãã¦ãã¾ããã" + IDS_DEV_NO_SOFTCONFIG "ReactOS ã¯ããã®ããã¤ã¹ã«å¯¾ããè¨å®ãæ±ºå®ã§ãã¾ããããã®ããã¤ã¹ã«ä»å±ããææ¸ã¨ç¸è«ããããæ§æãã»ããããããã«ãªã½ã¼ã¹ ã¿ããä½¿ç¨ãã¦ä¸ããã" + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ã«å¯¾ããããã¤ã¹ ãã©ã¤ããåæåã§ãã¾ããã" + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ä»¥åã®ããã¤ã¹ ãã©ã¤ãã®å®ä½ãã¡ã¢ãªã¼ä¸ã«ãããããReactOS ã¯ããã®ããã¤ã¹ ãã©ã¤ããèªã¿è¾¼ãã¾ããã" + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ã«å¯¾ããããã¤ã¹ ãã©ã¤ããèªã¿è¾¼ãã¾ããããã©ã¤ãã¯ãå£ãã¦ãããè¦ã¤ããã¾ããã" + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ã¬ã¸ã¹ããªä¸ã«ãµã¼ãã¹ ãã¼æå ±ãè¦ã¤ãããªãããä¸æ£ã«è¨é²ããã¦ãããããReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ã«ã¢ã¯ã»ã¹ã§ãã¾ããã" + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ã«å¯¾ããããã¤ã¹ ãã©ã¤ããæ£ããèªã¿è¾¼ã¿ã¾ãããããã¼ãã¦ã§ã¢ ããã¤ã¹ãè¦ã¤ããã¾ããã" + IDS_DEV_DUPLICATE_DEVICE "ã·ã¹ãã ã«éè¤ããããã¤ã¹ããã§ã«ä½åãã¦ãããããReactOS ã¯ãã®ãã¼ãã¦ã§ã¢ã«å¯¾ããããã¤ã¹ ãã©ã¤ããèªã¿è¾¼ãã¾ããã" + IDS_DEV_FAILED_POST_START "ReactOS ã¯ãããã¤ã¹ãåé¡ãå ±åããããããã®ããã¤ã¹ãåæ¢ãã¾ããã" + IDS_DEV_HALTED "ã¢ããªã±ã¼ã·ã§ã³ããµã¼ãã¹ã¯ããã®ãã¼ãã¦ã§ã¢ ããã¤ã¹ãã·ã£ãããã¦ã³ãã¾ããã" + IDS_DEV_PHANTOM "ç¾å¨ããã®ãã¼ãã¦ã§ã¢ ããã¤ã¹ã¯ãã³ã³ãã¥ã¼ã¿ã«æ¥ç¶ããã¦ãã¾ããã" + IDS_DEV_SYSTEM_SHUTDOWN "OS ãã·ã£ãããã¦ã³ä¸ã®ãããReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ ããã¤ã¹ã¸ã®ã¢ã¯ã»ã¹ãåå¾ã§ãã¾ããã" + IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" + IDS_DEV_DRIVER_BLOCKED "ãã®ããã¤ã¹ã«å¯¾ããã½ããã¦ã§ã¢ã¯ãReactOS ã¨ã®åé¡ããããã¨ãåãã£ã¦ãããããèµ·åããããã¯ããã¦ãã¾ããæ°ãããã©ã¤ãã®ãã¼ãã¦ã§ã¢ã®ãã³ãã¼ã«é£çµ¡ãã¦ä¸ããã" + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS ã¯ãã·ã¹ãã ãã¤ããå¤§ããããï¼ã¬ã¸ã¹ããª ãµã¤ãºã®å¶éãè¶ããï¼ãããæ°ãããã¼ãã¦ã§ã¢ ããã¤ã¹ãéå§ã§ãã¾ããã" + IDS_DEV_SETPROPERTIES_FAILED "ReactOS ã¯ããã®ããã¤ã¹ã®è¨å®ãå¤æ´ã§ãã¾ããã§ããã" +END + +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device Instance ID" + IDS_PROP_HARDWAREIDS "Hardware IDs" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_CAPABILITIES "Capabilities" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTIONRELATIONS "Ejection Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Device Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Device Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Class Upper Filters" + IDS_PROP_CLASSLOWERFILTERS "Class Lower Filters" + IDS_PROP_CLASSINSTALLER "Class Installers" + IDS_PROP_CLASSCOINSTALLER "Class Coinstallers" + IDS_PROP_DEVICECOINSTALLER "Device Coinstallers" + IDS_PROP_FIRMWAREREVISION "Firmware Revision" + IDS_PROP_CURRENTPOWERSTATE "Current Power State" + IDS_PROP_POWERCAPABILITIES "Power Capabilities" + IDS_PROP_POWERSTATEMAPPINGS "Power State Mappings" +END + +IDD_HARDWARE DIALOGEX 0, 0, 300, 400 +STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ããã¤ã¹(&D):", IDC_DEVICES, 7, 6, 196, 10 + CONTROL "", IDC_LV_DEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | + LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 16, 196, 50 + GROUPBOX "ããã¤ã¹ ããããã£", IDC_PROPERTIESGROUP, 7, 76, 196, 105 + LTEXT "", IDC_MANUFACTURER, 14, 88, 183, 10, SS_ENDELLIPSIS + LTEXT "", IDC_LOCATION, 14, 100, 183, 10, SS_ENDELLIPSIS + LTEXT "", IDC_STATUS, 14, 112, 183, 30 + PUSHBUTTON "åé¡ç©¶æ(&T)...", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "ããããã£(&R)", IDC_PROPERTIES, 146, 140, 50, 14 +END + +IDD_DEVICEGENERAL DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ä¸è¬" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ããã¤ã¹ã®ç¨®é¡:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "è£½é å:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "å°å:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "ããã¤ã¹ã®ç¶æ", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "åé¡ç©¶æ(&T)...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "ããã¤ã¹ã®ä½¿ç¨(&D):", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END + +IDD_DEVICEDRIVER DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãã©ã¤ã" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ãã©ã¤ã æä¾å:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã©ã¤ãã®æ¥ä»:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã©ã¤ãã®ãã¼ã¸ã§ã³:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã¸ã¿ã«ç½²åè:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "ãã©ã¤ãã®è©³ç´°(&D)...", IDC_DRIVERDETAILS, 7, 106, 75, 15 + LTEXT "ãã©ã¤ã ãã¡ã¤ã«ã®è©³ç´°ãè¡¨ç¤ºãã¾ãã", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "ãã©ã¤ãã®æ´æ°(&U)...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "ããã¤ã¹ ãã©ã¤ããæ´æ°ãã¾ãã", -1, 91, 130, 154, 17, SS_NOPREFIX +END + +IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "ãã©ã¤ã ãã¡ã¤ã«ã®è©³ç´°" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ãã©ã¤ã ãã¡ã¤ã«(&D):", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "æä¾å:", -1, 14, 134, 50, 8 + EDITTEXT IDC_FILEPROVIDER, 66, 134, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã¡ã¤ã« ãã¼ã¸ã§ã³:", -1, 14, 150, 50, 8 + EDITTEXT IDC_FILEVERSION, 66, 150, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "èä½æ¨©:", -1, 14, 166, 50, 8 + EDITTEXT IDC_FILECOPYRIGHT, 66, 166, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã¸ã¿ã«ç½²åå:", -1, 14, 182, 50, 8 + EDITTEXT IDC_DIGITALSIGNER, 66, 182, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", IDOK, 167, 208, 50, 14 +END + +IDD_DEVICEDETAILS DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "è©³ç´°" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_DETAILSPROPVALUE, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãªã½ã¼ã¹" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ãªã½ã¼ã¹è¨å®:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 +END + +IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "é»æº" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + + +/* + This code relates to the device manager GUI + */ + +IDR_MAINMENU MENU +BEGIN + POPUP "ãã¡ã¤ã«(&F)" + BEGIN + MENUITEM "çµäº(&X)", IDC_EXIT + END + MENUITEM "ã¢ã¯ã·ã§ã³(&A)", IDC_ACTIONMENU + POPUP "è¡¨ç¤º(&V)" + BEGIN + MENUITEM "ç¨®é¡å¥ããã¤ã¹(&E)", IDC_DEVBYTYPE + MENUITEM "æ¥ç¶å¥ããã¤ã¹(&V)", IDC_DEVBYCONN + MENUITEM "ç¨®é¡å¥ãªã½ã¼ã¹(&Y)", IDC_RESBYTYPE, GRAYED + MENUITEM "æ¥ç¶å¥ãªã½ã¼ã¹(&N)", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "é ãããã¤ã¹ãè¡¨ç¤º(&W)", IDC_SHOWHIDDEN + END + POPUP "ãã«ã(&H)" + BEGIN + MENUITEM "ãã¼ã¸ã§ã³æå ±(&A)", IDC_ABOUT + END +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS ããã¤ã¹ ããã¼ã¸ã£" + IDS_CONFIRM_DISABLE "ãã®ããã¤ã¹ãç¡å¹ã«ããã¨ãæ©è½ãæ¢ã¾ãã¾ãã\r\nãããæ¬å½ã«ç¡å¹ã«ãããã§ããï¼" + IDS_CONFIRM_UNINSTALL "è¦å: ããªãã®ã·ã¹ãã ãããã®ããã¤ã¹ãã¢ã³ã¤ã³ã¹ãã¼ã«ãããã¨ãã¦ãã¾ãã\r\nç¶è¡ãããã§ããï¼" +END +STRINGTABLE DISCARDABLE +BEGIN + IDS_MENU_UPDATE "ãã©ã¤ã ã½ããã¦ã§ã¢ãæ´æ°..." + IDS_MENU_ENABLE "æå¹ã«ãã" + IDS_MENU_DISABLE "ç¡å¹ã«ãã" + IDS_MENU_UNINSTALL "ã¢ã³ã¤ã³ã¹ãã¼ã«" + IDS_MENU_SCAN "ãã¼ãã¦ã§ã¢ã®å¤æ´ãã¹ãã£ã³" + IDS_MENU_ADD "ãã¼ãã¦ã§ã¢ãè¿½å " + IDS_MENU_PROPERTIES "ããããã£" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROPERTIES "ããããã£" + IDS_TOOLTIP_SCAN "ãã¼ãã¦ã§ã¢ã®å¤æ´ãã¹ãã£ã³" + IDS_TOOLTIP_ENABLE "æå¹ã«ãã" + IDS_TOOLTIP_DISABLE "ç¡å¹ã«ãã" + IDS_TOOLTIP_UPDATE "æ´æ°ãã©ã¤ã ã½ããã¦ã§ã¢" + IDS_TOOLTIP_UNINSTALL "ã¢ã³ã¤ã³ã¹ãã¼ã«" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_PROPERTIES " ç¾å¨ã®é¸æã«å¯¾ããããããã£ ãã¤ã¢ãã°ãéãã¾ãã" + IDS_HINT_SCAN " å¤æ´ã¾ãã¯æ°è¦ã®ãã©ã° ã¢ã³ã ãã¬ã¤ ããã¤ã¹ãã¹ãã£ã³ãã¾ãã" + IDS_HINT_ENABLE " é¸æä¸ã®ããã¤ã¹ãæå¹ã«ãã¾ãã" + IDS_HINT_DISABLE " é¸æä¸ã®ããã¤ã¹ãç¡å¹ã«ãã¾ãã" + IDS_HINT_UPDATE " é¸æä¸ã®ããã¤ã¹ã«å¯¾ããããã¤ã¹æ´æ°ã½ããã¦ã§ã¢ ã¦ã£ã¶ã¼ããèµ·åãã¾ãã" + IDS_HINT_UNINSTALL " é¸æä¸ã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããã¢ã³ã¤ã³ã¹ãã¼ã«ãã¾ãã" + IDS_HINT_ADD " ã¬ã¬ã·ã¼ (éãã©ã° ã¢ã³ã ãã¬ã¤) ããã¤ã¹ãã³ã³ãã¥ã¼ã¿ã«è¿½å ãã¾ãã" + IDS_HINT_ABOUT " ReactOS ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦." + IDS_HINT_EXIT " ããã°ã©ã ãçµäºãã¾ãã" + + IDS_HINT_DEV_BY_TYPE " ãã¼ãã¦ã§ã¢ã®ç¨®é¡å¥ã«ããã¤ã¹ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_DEV_BY_CONN " æ¥ç¶å¥ã«ããã¤ã¹ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_RES_BY_TYPE " ç¨®é¡å¥ã«ãªã½ã¼ã¹ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_RES_BY_CONN " æ¥ç¶ã®ç¨®é¡å¥ã«ãªã½ã¼ã¹ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_SHOW_HIDDEN " ã¬ã¬ã·ã¼ ããã¤ã¹ã¨ãã¤ã³ã¹ãã¼ã«ã§ããªããªã£ãããã¤ã¹ãè¡¨ç¤ºãã¾ãã" + + IDS_HINT_SYS_RESTORE " ãã®ã¦ã£ã³ãã¦ãåã®ãµã¤ãºã«æ»ãã¾ãã" + IDS_HINT_SYS_MOVE " ãã®ã¦ã£ã³ãã¦ãåããã¾ãã" + IDS_HINT_SYS_SIZE " ãã®ã¦ã£ã³ãã¦ã®ãµã¤ãºãå¤æ´ãã¾ãã" + IDS_HINT_SYS_MINIMIZE " ãã®ã¦ã£ã³ãã¦ãã¢ã¤ã³ã³ã«ç¸®å°ãã¾ãã" + IDS_HINT_SYS_MAXIMIZE " ãã®ã¦ã£ã³ãã¦ãã¹ã¯ãªã¼ã³ãæºããããã«åºãã¾ãã" + IDS_HINT_SYS_CLOSE " ãã®ã¦ã£ã³ãã¦ãéãã¾ãã" +END Propchange: trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 75875: SysSetup: Russian translation of Theme dialog Patch by amber. CORE-13708
by ekohl＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: ekohl Date: Sun Sep 17 22:23:24 2017 New Revision: 75875 URL: http://svn.reactos.org/svn/reactos?rev=75875&view=rev Log: SysSetup: Russian translation of Theme dialog Patch by amber. CORE-13708 Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sun Sep 17 22:23:24 2017 @@ -87,11 +87,11 @@ IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Ð¢ÐµÐ¼Ð° ""Lautus""", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "ÐÐ»Ð°ÑÑÐ¸ÑÐµÑÐºÐ°Ñ ÑÐµÐ¼Ð°", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -146,8 +146,8 @@ IDS_DATETIMESUBTITLE "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÑ Ð´Ð°ÑÑ Ð¸ Ð²ÑÐµÐ¼Ñ Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ." IDS_PROCESSTITLE "ÐÑÐ¾ÑÐµÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" IDS_PROCESSSUBTITLE "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS Ð½Ð° Ð²Ð°Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." - IDS_THEMESELECTIONTITLE "Appearance" - IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" + IDS_THEMESELECTIONTITLE "ÐÐ½ÐµÑÐ½Ð¸Ð¹ Ð²Ð¸Ð´" + IDS_THEMESELECTIONSUBTITLE "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐµÐ¼Ñ, ÐºÐ¾ÑÐ¾ÑÑÑ Ð²Ñ Ð¿ÑÐµÐ´Ð¿Ð¾ÑÐ¸ÑÐ°ÐµÑÐµ" END STRINGTABLE

1 0

[ekohl] 75874: TRANSLATION: Update Polish translation Patch by Marcin Mikołajczak. CORE-13750
by ekohl＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: ekohl Date: Sun Sep 17 22:11:50 2017 New Revision: 75874 URL: http://svn.reactos.org/svn/reactos?rev=75874&view=rev Log: TRANSLATION: Update Polish translation Patch by Marcin Mikołajczak. CORE-13750 Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/shell/explorer/lang/pl-PL.rc trunk/reactos/base/system/userinit/lang/pl-PL.rc trunk/reactos/base/system/winlogon/lang/pl-PL.rc Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Sun Sep 17 22:11:50 2017 @@ -6,6 +6,7 @@ * Update - niski (bjauy(a)o2.pl) * Updated by Caemyr (Olaf Siejka), Mar 2011 * UTF-8 conversion by Caemyr (May, 2011) + * Updated by Marcin MikoÅajczak <me(a)m4sk.in> (September, 2017) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -26,9 +27,9 @@ FONT 8, "MS Shell Dlg" BEGIN AUTORADIOBUTTON "Zainstaluj ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + LTEXT "Zainstaluj nowÄ kopiÄ ReactOS. Ta opcja nie zachowa plikÃ³w, ustawieÅ i programÃ³w. MoÅ¼esz dokonaÄ zmian w dyskach i partycjach.", IDC_INSTALLTEXT, 18, 18, 269, 25 AUTORADIOBUTTON "Napraw lub zaktualizuj zainstalowany wczeÅniej ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Zaktualizuj lub napraw istniejÄcÄ kopiÄ systemu ReactOS. Ta opcja zachowa pliki, ustawienia i programy. Jest dostÄpna, jeÅ¼eli ReactOS znajduje siÄ juÅ¼ na tym komputerze.", IDC_UPDATETEXT, 18, 61, 269, 30 LTEXT "NaciÅnij Dalej, aby zmieniÄ ustawienia sprzÄtu.", IDC_STATIC, 7, 128, 297, 8 END @@ -82,10 +83,10 @@ BEGIN CONTROL "Folder instalacji", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Instalacja bootloadera", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Wgraj bootloader na dysk twardy (MBR i VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Wgraj bootloader na dysk twardy (tylko VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "PomiÅ wgrywanie bootloadera", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 + CONTROL "Instalacja menedÅ¼era rozruchu", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 + CONTROL "Wgraj menedÅ¼er rozruchu na dysk twardy (MBR i VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 + CONTROL "Wgraj menedÅ¼er rozruchu na dysk twardy (tylko VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 + CONTROL "PomiÅ wgrywanie menedÅ¼era rozruchu", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Anuluj", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE END @@ -126,9 +127,9 @@ IDS_DEVICETITLE "Ustawienia podstawowych urzÄdzeÅ" IDS_DEVICESUBTITLE "ZmieÅ ustawienia ekranu i klawiatury." IDS_DRIVETITLE "Ustaw partycjÄ instalacji i folder systemowy" - IDS_DRIVESUBTITLE "Przygotuj partycje instalacji, folder systemowy i bootloader." + IDS_DRIVESUBTITLE "Przygotuj partycje instalacji, folder systemowy i menedÅ¼er rozruchu." IDS_PROCESSTITLE "Przygotuj partycjÄ, skopiuj pliki i zapisz ustawienia systemu" - IDS_PROCESSSUBTITLE "Przygotuj i sformatuj partycjÄ, skopiuj pliki, skopiuj i zainstaluj bootloader" + IDS_PROCESSSUBTITLE "Przygotuj i sformatuj partycjÄ, skopiuj pliki, skopiuj i zainstaluj menedÅ¼er rozruchu" IDS_RESTARTTITLE "Pierwszy etap instalacji zakoÅczony sukcesem" IDS_RESTARTSUBTITLE "Pierwszy etap instalacji zostaÅ zakoÅczony, uruchom ponownie komputer, aby przejÅÄ do drugiego etapu" IDS_SUMMARYTITLE "Podsumowanie instalacji" @@ -141,7 +142,7 @@ STRINGTABLE BEGIN - IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" - IDS_PARTITION_TYPE "Type" + IDS_PARTITION_NAME "Nazwa" + IDS_PARTITION_SIZE "Rozmiar" + IDS_PARTITION_TYPE "Rodzaj" END Modified: trunk/reactos/base/shell/explorer/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/p… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/pl-PL.rc [iso-8859-1] Sun Sep 17 22:11:50 2017 @@ -5,6 +5,7 @@ * IRC: irc.freenode.net #reactos-pl; * Updated by niski - Maciej Bialas (bjauy(a)o2.pl), July 2009 * UTF-8 conversion by Caemyr (May, 2011) + * Updated by Marcin MikoÅajczak <me(a)m4sk.in> (September, 2017) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -83,10 +84,10 @@ AUTOCHECKBOX "&Trzymaj pasek zadaÅ na wierzchu", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupuj podobne przyciski paska zadaÅ", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "PokaÅ¼ pasek &Szybkiego uruchamiania", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification bar", IDC_STATIC, 6, 114, 240, 58 + GROUPBOX "Pasek powiadomieÅ", IDC_STATIC, 6, 114, 240, 58 CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 AUTOCHECKBOX "&Zegar", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED + AUTOCHECKBOX "Pokazuj sekundy", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED LTEXT "MoÅ¼esz uporzÄdkowaÄ obszar powiadomieÅ poprzez ukrycie rzadko uÅ¼ywanych ikon.", IDC_STATIC, 13, 169, 223, 16 AUTOCHECKBOX "&Ukryj nieaktywne ikony", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 @@ -109,10 +110,10 @@ IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 +CAPTION "Dostosuj powiadomienia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "DomyÅlnie ReactOS wyÅwietla ikony aktywnych i waÅ¼nych powiadomieÅ, ukrywajÄc te nieaktywne. MoÅ¼esz zmieniÄ to zachowanie lub wybraÄ elementy korzystajÄc z poniÅ¼szej listy.", IDC_STATIC, 6, 6, 220, 30 LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS @@ -168,26 +169,26 @@ GROUPBOX "Recent documents ", IDC_STATIC, 7, 133, 238, 56 LTEXT "Select this option to provide quick access to the documents you opened most recently. Clearing this list does not delete the documents.", IDC_STATIC, 14, 144, 224, 21 AUTOCHECKBOX "List my most &recently opened documents", IDC_RECENTLY, 14, 168, 147, 10 - PUSHBUTTON "&Clear List", IDC_CLEAR, 182, 168, 55, 14 + PUSHBUTTON "Wy&czyÅÄ listÄ", IDC_CLEAR, 182, 168, 55, 14 } IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "General" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 +CAPTION "OgÃ³lne" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Wybierz rozmiar ikon dla programÃ³w ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP - GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 - LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 + AUTORADIOBUTTON "&DuÅ¼e ikony", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "&MaÅe ikony", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + GROUPBOX "Programy ", IDC_STATIC, 7, 49, 238, 70 + LTEXT "Menu Start zawiera skrÃ³ty do najczÄÅciej uÅ¼ywanych programÃ³w. Wyczyszczenie tej listy nie spowoduje usuniÄcia programÃ³w.", IDC_STATIC, 14, 63, 224, 20 + LTEXT "Liczba programÃ³w w me&nu Start:", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Clear List", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "Show on Start menu ", IDC_STATIC, 7, 126, 238, 63 + PUSHBUTTON "Wy&czyÅÄ listÄ", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "Pokazuj w menu Start ", IDC_STATIC, 7, 126, 238, 63 AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&E-mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 Modified: trunk/reactos/base/system/userinit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/pl-PL.rc [iso-8859-1] Sun Sep 17 22:11:50 2017 @@ -3,6 +3,7 @@ * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl * UTF-8 conversion by Caemyr (May, 2011) + * Updated by Marcin MikoÅajczak <me(a)m4sk.in> (September, 2017) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -13,15 +14,15 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 - RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&JÄzyk:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&UkÅad klawiatury:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + LTEXT "Wybierz jÄzyk i ukÅad klawiatury, a nastÄpnie naciÅnij Dalej.", IDC_STATIC, 7, 152, 300, 8 CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 - DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + DEFPUSHBUTTON "&Dalej", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Anuluj", IDCANCEL, 260, 172, 50, 14 END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 @@ -30,24 +31,24 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 + DEFPUSHBUTTON "Uruchom &LiveCD ReactOS", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Zainstaluj ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 - PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + PUSHBUTTON "&Wstecz", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Anuluj", IDCANCEL, 260, 172, 50, 14 END STRINGTABLE BEGIN - IDS_SHELL_FAIL "Nie powiodÅo siÄ uruchomienie powÅoki przez userinit!" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!" - IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." + IDS_SHELL_FAIL "Uruchomienie powÅoki przez userinit nie powiodÅo siÄ!" + IDS_INSTALLER_FAIL "RozpoczÄcie instalatora przez userinit nie powiodÅo siÄ!" + IDS_CANCEL_CONFIRM "Czy na pewno chcesz wyjÅÄ z ReactOS LiveCD?\nJeÅ¼eli wybierzesz tÄ opcjÄ, komputer moÅ¼e uruchomiÄ siÄ ponownie." END STRINGTABLE BEGIN - IDS_SPAIN "Spanish (Spain)" + IDS_SPAIN "HiszpaÅski (Hiszpania)" END Modified: trunk/reactos/base/system/winlogon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/pl-PL.rc [iso-8859-1] Sun Sep 17 22:11:50 2017 @@ -2,6 +2,7 @@ * Translated by Sebastian Gasiorek * https://sourceforge.net/projects/reactospl * UTF-8 conversion by Caemyr (May, 2011) + * Updated by Marcin MikoÅajczak <me(a)m4sk.in> (September, 2017) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -11,7 +12,7 @@ CAPTION "WyÅÄczanie komputera" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "MoÅ¼na bezpiecznie wyÅÄczyÄ komputer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "MoÅ¼esz teraz bezpiecznie wyÅÄczyÄ komputer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END

1 0

[akhaldi] 75873: [GDIPLUS_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 12:34:24 2017 New Revision: 75873 URL: http://svn.reactos.org/svn/reactos?rev=75873&view=rev Log: [GDIPLUS_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/gdiplus/brush.c trunk/rostests/winetests/gdiplus/customlinecap.c trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/graphicspath.c trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/gdiplus/matrix.c trunk/rostests/winetests/gdiplus/metafile.c trunk/rostests/winetests/gdiplus/pathiterator.c trunk/rostests/winetests/gdiplus/pen.c trunk/rostests/winetests/gdiplus/region.c trunk/rostests/winetests/gdiplus/stringformat.c Modified: trunk/rostests/winetests/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/brush.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/brush.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -32,6 +32,8 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) +static HWND hwnd; + static void test_constructor_destructor(void) { GpStatus status; @@ -179,12 +181,17 @@ { GpStatus status; GpTexture *texture; + GpLineGradient *line; GpGraphics *graphics = NULL; GpBitmap *bitmap; HDC hdc = GetDC(0); GpMatrix *m, *m1; BOOL res; - + GpPointF start, end; + GpRectF rectf; + REAL elements[6]; + + /* GpTexture */ status = GdipCreateMatrix2(2.0, 0.0, 0.0, 0.0, 0.0, 0.0, &m); expect(Ok, status); @@ -238,6 +245,245 @@ expect(Ok, status); status = GdipDeleteGraphics(graphics); expect(Ok, status); + + + + status = GdipCreateFromHWND(hwnd, &graphics); + expect(Ok, status); + + /* GpLineGradient */ + /* create with vertical gradient line */ + start.X = start.Y = end.X = 0.0; + end.Y = 100.0; + + status = GdipCreateLineBrush(&start, &end, (ARGB)0xffff0000, 0xff00ff00, WrapModeTile, &line); + expect(Ok, status); + + status = GdipCreateMatrix2(1.0, 0.0, 0.0, 1.0, 0.0, 0.0, &m); + expect(Ok, status); + + /* NULL arguments */ + status = GdipResetLineTransform(NULL); + expect(InvalidParameter, status); + status = GdipSetLineTransform(NULL, m); + expect(InvalidParameter, status); + status = GdipSetLineTransform(line, NULL); + expect(InvalidParameter, status); + status = GdipGetLineTransform(NULL, m); + expect(InvalidParameter, status); + status = GdipGetLineTransform(line, NULL); + expect(InvalidParameter, status); + status = GdipScaleLineTransform(NULL, 1, 1, MatrixOrderPrepend); + expect(InvalidParameter, status); + status = GdipMultiplyLineTransform(NULL, m, MatrixOrderPrepend); + expect(InvalidParameter, status); + status = GdipTranslateLineTransform(NULL, 0, 0, MatrixOrderPrepend); + expect(InvalidParameter, status); + + /* initial transform */ + status = GdipGetLineTransform(line, m); + expect(Ok, status); + + status = GdipGetMatrixElements(m, elements); + expect(Ok, status); + expectf(0.0, elements[0]); + expectf(1.0, elements[1]); + expectf(-1.0, elements[2]); + expectf(0.0, elements[3]); + expectf(50.0, elements[4]); + expectf(50.0, elements[5]); + + status = GdipGetLineRect(line, &rectf); + expect(Ok, status); + expectf(-50.0, rectf.X); + expectf(0.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + + status = GdipFillRectangle(graphics, (GpBrush*)line, 0, 0, 200, 200); + expect(Ok, status); + + /* manually set transform */ + GdipSetMatrixElements(m, 2.0, 0.0, 0.0, 4.0, 0.0, 0.0); + + status = GdipSetLineTransform(line, m); + expect(Ok, status); + + status = GdipGetLineTransform(line, m); + expect(Ok, status); + + status = GdipGetMatrixElements(m, elements); + expect(Ok, status); + expectf(2.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(4.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + + status = GdipGetLineRect(line, &rectf); + expect(Ok, status); + expectf(-50.0, rectf.X); + expectf(0.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + + status = GdipFillRectangle(graphics, (GpBrush*)line, 200, 0, 200, 200); + expect(Ok, status); + + /* scale transform */ + status = GdipScaleLineTransform(line, 4.0, 0.5, MatrixOrderAppend); + expect(Ok, status); + + status = GdipGetLineTransform(line, m); + expect(Ok, status); + + status = GdipGetMatrixElements(m, elements); + expect(Ok, status); + expectf(8.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(2.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + + status = GdipGetLineRect(line, &rectf); + expect(Ok, status); + expectf(-50.0, rectf.X); + expectf(0.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + + status = GdipFillRectangle(graphics, (GpBrush*)line, 400, 0, 200, 200); + expect(Ok, status); + + /* translate transform */ + status = GdipTranslateLineTransform(line, 10.0, -20.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipGetLineTransform(line, m); + expect(Ok, status); + + status = GdipGetMatrixElements(m, elements); + expect(Ok, status); + expectf(8.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(2.0, elements[3]); + expectf(10.0, elements[4]); + expectf(-20.0, elements[5]); + + status = GdipGetLineRect(line, &rectf); + expect(Ok, status); + expectf(-50.0, rectf.X); + expectf(0.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + + status = GdipFillRectangle(graphics, (GpBrush*)line, 0, 200, 200, 200); + expect(Ok, status); + + /* multiply transform */ + GdipSetMatrixElements(m, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + GdipRotateMatrix(m, 45.0, MatrixOrderAppend); + GdipScaleMatrix(m, 0.25, 0.5, MatrixOrderAppend); + + status = GdipMultiplyLineTransform(line, m, MatrixOrderAppend); + expect(Ok, status); + + /* NULL transform does nothing */ + status = GdipMultiplyLineTransform(line, NULL, MatrixOrderAppend); + expect(Ok, status); + + status = GdipGetLineTransform(line, m); + expect(Ok, status); + + status = GdipGetMatrixElements(m, elements); + expect(Ok, status); + expectf(1.414214, elements[0]); + expectf(2.828427, elements[1]); + expectf(-0.353553, elements[2]); + expectf(0.707107, elements[3]); + expectf(5.303300, elements[4]); + expectf(-3.535534, elements[5]); + + status = GdipGetLineRect(line, &rectf); + expect(Ok, status); + expectf(-50.0, rectf.X); + expectf(0.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + + status = GdipFillRectangle(graphics, (GpBrush*)line, 200, 200, 200, 200); + expect(Ok, status); + + /* reset transform sets to identity */ + status = GdipResetLineTransform(line); + expect(Ok, status); + + status = GdipGetLineTransform(line, m); + expect(Ok, status); + + status = GdipGetMatrixElements(m, elements); + expect(Ok, status); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(1.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + + status = GdipGetLineRect(line, &rectf); + expect(Ok, status); + expectf(-50.0, rectf.X); + expectf(0.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + + status = GdipFillRectangle(graphics, (GpBrush*)line, 400, 200, 200, 200); + expect(Ok, status); + + GdipDeleteBrush((GpBrush*)line); + + /* passing negative Width/Height to LinearGradientModeHorizontal */ + rectf.X = rectf.Y = 10.0; + rectf.Width = rectf.Height = -100.0; + status = GdipCreateLineBrushFromRect(&rectf, (ARGB)0xffff0000, 0xff00ff00, + LinearGradientModeHorizontal, WrapModeTile, &line); + expect(Ok, status); + memset(&rectf, 0, sizeof(GpRectF)); + status = GdipGetLineRect(line, &rectf); + expect(Ok, status); + expectf(10.0, rectf.X); + expectf(10.0, rectf.Y); + expectf(-100.0, rectf.Width); + expectf(-100.0, rectf.Height); + status = GdipGetLineTransform(line, m); + expect(Ok, status); + status = GdipGetMatrixElements(m, elements); + expect(Ok,status); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(1.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + status = GdipFillRectangle(graphics, (GpBrush*)line, 0, 400, 200, 200); + expect(Ok, status); + status = GdipDeleteBrush((GpBrush*)line); + expect(Ok,status); + + if(0){ + /* enable to visually compare with Windows */ + MSG msg; + while(GetMessageW(&msg, hwnd, 0, 0) > 0){ + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + + GdipDeleteMatrix(m); + GdipDeleteGraphics(graphics); ReleaseDC(0, hdc); } @@ -313,20 +559,18 @@ expectf(99.0, rectf.Width); expectf(99.0, rectf.Height); status = GdipGetLineTransform(brush, transform); - todo_wine expect(Ok, status); - if (status == Ok) - { - status = GdipGetMatrixElements(transform, elements); - expect(Ok, status); - expectf(1.0, elements[0]); - expectf(1.0, elements[1]); - expectf(-1.0, elements[2]); - expectf(1.0, elements[3]); - expectf(50.50, elements[4]); - expectf(-50.50, elements[5]); - } + expect(Ok, status); + status = GdipGetMatrixElements(transform, elements); + expect(Ok, status); + expectf(1.0, elements[0]); + expectf(1.0, elements[1]); + expectf(-1.0, elements[2]); + expectf(1.0, elements[3]); + expectf(50.50, elements[4]); + expectf(-50.50, elements[5]); status = GdipDeleteBrush((GpBrush*)brush); expect(Ok, status); + /* vertical gradient */ pt1.X = pt1.Y = pt2.X = 0.0; pt2.Y = 10.0; @@ -340,20 +584,18 @@ expectf(10.0, rectf.Width); expectf(10.0, rectf.Height); status = GdipGetLineTransform(brush, transform); - todo_wine expect(Ok, status); - if (status == Ok) - { - status = GdipGetMatrixElements(transform, elements); - expect(Ok, status); - expectf(0.0, elements[0]); - expectf(1.0, elements[1]); - expectf(-1.0, elements[2]); - expectf(0.0, elements[3]); - expectf(5.0, elements[4]); - expectf(5.0, elements[5]); - } + expect(Ok, status); + status = GdipGetMatrixElements(transform, elements); + expect(Ok, status); + expectf(0.0, elements[0]); + expectf(1.0, elements[1]); + expectf(-1.0, elements[2]); + expectf(0.0, elements[3]); + expectf(5.0, elements[4]); + expectf(5.0, elements[5]); status = GdipDeleteBrush((GpBrush*)brush); expect(Ok, status); + /* horizontal gradient */ pt1.X = pt1.Y = pt2.Y = 0.0; pt2.X = 10.0; @@ -367,20 +609,18 @@ expectf(10.0, rectf.Width); expectf(10.0, rectf.Height); status = GdipGetLineTransform(brush, transform); - todo_wine expect(Ok, status); - if (status == Ok) - { - status = GdipGetMatrixElements(transform, elements); - expect(Ok, status); - expectf(1.0, elements[0]); - expectf(0.0, elements[1]); - expectf(0.0, elements[2]); - expectf(1.0, elements[3]); - expectf(0.0, elements[4]); - expectf(0.0, elements[5]); - } + expect(Ok, status); + status = GdipGetMatrixElements(transform, elements); + expect(Ok, status); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(1.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); status = GdipDeleteBrush((GpBrush*)brush); expect(Ok, status); + /* slope = -1 */ pt1.X = pt1.Y = 0.0; pt2.X = 20.0; @@ -395,20 +635,18 @@ expectf(20.0, rectf.Width); expectf(20.0, rectf.Height); status = GdipGetLineTransform(brush, transform); - todo_wine expect(Ok, status); - if (status == Ok) - { - status = GdipGetMatrixElements(transform, elements); - expect(Ok, status); - expectf(1.0, elements[0]); - expectf(-1.0, elements[1]); - expectf(1.0, elements[2]); - expectf(1.0, elements[3]); - expectf(10.0, elements[4]); - expectf(10.0, elements[5]); - } + expect(Ok, status); + status = GdipGetMatrixElements(transform, elements); + expect(Ok, status); + expectf(1.0, elements[0]); + expectf(-1.0, elements[1]); + expectf(1.0, elements[2]); + expectf(1.0, elements[3]); + expectf(10.0, elements[4]); + expectf(10.0, elements[5]); status = GdipDeleteBrush((GpBrush*)brush); expect(Ok, status); + /* slope = 1/100 */ pt1.X = pt1.Y = 0.0; pt2.X = 100.0; @@ -423,20 +661,18 @@ expectf(100.0, rectf.Width); expectf(1.0, rectf.Height); status = GdipGetLineTransform(brush, transform); - todo_wine expect(Ok, status); - if (status == Ok) - { - status = GdipGetMatrixElements(transform, elements); - expect(Ok,status); - expectf(1.0, elements[0]); - expectf(0.01, elements[1]); - expectf(-0.02, elements[2]); - /* expectf(2.0, elements[3]); */ - expectf(0.01, elements[4]); - /* expectf(-1.0, elements[5]); */ - } + expect(Ok, status); + status = GdipGetMatrixElements(transform, elements); + expect(Ok,status); + expectf(1.0, elements[0]); + expectf(0.01, elements[1]); + expectf(-0.02, elements[2]); + /* expectf(2.0, elements[3]); */ + expectf(0.01, elements[4]); + /* expectf(-1.0, elements[5]); */ status = GdipDeleteBrush((GpBrush*)brush); expect(Ok,status); + /* zero height rect */ rectf.X = rectf.Y = 10.0; rectf.Width = 100.0; @@ -444,6 +680,7 @@ status = GdipCreateLineBrushFromRect(&rectf, 0, 0, LinearGradientModeVertical, WrapModeTile, &brush); expect(OutOfMemory, status); + /* zero width rect */ rectf.X = rectf.Y = 10.0; rectf.Width = 0.0; @@ -451,6 +688,7 @@ status = GdipCreateLineBrushFromRect(&rectf, 0, 0, LinearGradientModeHorizontal, WrapModeTile, &brush); expect(OutOfMemory, status); + /* from rect with LinearGradientModeHorizontal */ rectf.X = rectf.Y = 10.0; rectf.Width = rectf.Height = 100.0; @@ -465,20 +703,18 @@ expectf(100.0, rectf.Width); expectf(100.0, rectf.Height); status = GdipGetLineTransform(brush, transform); - todo_wine expect(Ok, status); - if (status == Ok) - { - status = GdipGetMatrixElements(transform, elements); - expect(Ok,status); - expectf(1.0, elements[0]); - expectf(0.0, elements[1]); - expectf(0.0, elements[2]); - expectf(1.0, elements[3]); - expectf(0.0, elements[4]); - expectf(0.0, elements[5]); - } + expect(Ok, status); + status = GdipGetMatrixElements(transform, elements); + expect(Ok,status); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(1.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); status = GdipDeleteBrush((GpBrush*)brush); expect(Ok,status); + /* passing negative Width/Height to LinearGradientModeHorizontal */ rectf.X = rectf.Y = 10.0; rectf.Width = rectf.Height = -100.0; @@ -493,20 +729,44 @@ expectf(-100.0, rectf.Width); expectf(-100.0, rectf.Height); status = GdipGetLineTransform(brush, transform); - todo_wine expect(Ok, status); - if (status == Ok) - { - status = GdipGetMatrixElements(transform, elements); - expect(Ok,status); - expectf(1.0, elements[0]); - expectf(0.0, elements[1]); - expectf(0.0, elements[2]); - expectf(1.0, elements[3]); - expectf(0.0, elements[4]); - expectf(0.0, elements[5]); - } + expect(Ok, status); + status = GdipGetMatrixElements(transform, elements); + expect(Ok,status); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(1.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); status = GdipDeleteBrush((GpBrush*)brush); expect(Ok,status); + + /* reverse gradient line as immediately previous */ + pt1.X = 10.0; + pt1.Y = 10.0; + pt2.X = -90.0; + pt2.Y = 10.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(-90.0, rectf.X); + expectf(-40.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + status = GdipGetLineTransform(brush, transform); + expect(Ok, status); + status = GdipGetMatrixElements(transform, elements); + expect(Ok, status); + expectf(-1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(-1.0, elements[3]); + expectf(-80.0, elements[4]); + expectf(20.0, elements[5]); + status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); GdipDeleteMatrix(transform); } @@ -1278,6 +1538,27 @@ { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + WNDCLASSA class; + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); + + memset( &class, 0, sizeof(class) ); + class.lpszClassName = "gdiplus_test"; + class.style = CS_HREDRAW | CS_VREDRAW; + class.lpfnWndProc = DefWindowProcA; + class.hInstance = GetModuleHandleA(0); + class.hIcon = LoadIconA(0, (LPCSTR)IDI_APPLICATION); + class.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + RegisterClassA( &class ); + hwnd = CreateWindowA( "gdiplus_test", "graphics test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 800, 600, 0, 0, GetModuleHandleA(0), 0 ); + ok(hwnd != NULL, "Expected window to be created\n"); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; @@ -1304,4 +1585,5 @@ test_pathgradientblend(); GdiplusShutdown(gdiplusToken); -} + DestroyWindow(hwnd); +} Modified: trunk/rostests/winetests/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/customl… ============================================================================== --- trunk/rostests/winetests/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/customlinecap.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -321,6 +321,13 @@ { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -1121,6 +1121,13 @@ { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -34,6 +34,8 @@ #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (INT)(expected), (INT)(got)) #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) + +static GpStatus (WINAPI *pGdipGraphicsSetAbort)(GpGraphics*,GdiplusAbort*); static const REAL mm_per_inch = 25.4; static const REAL point_per_inch = 72.0; @@ -1870,6 +1872,15 @@ status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, 0); expect(InvalidParameter, status); status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, -1); + expect(InvalidParameter, status); + + status = GdipTransformPoints(graphics, CoordinateSpaceDevice+1, CoordinateSpaceWorld, ptf, 2); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, -1, CoordinateSpaceWorld, ptf, 2); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceDevice+1, ptf, 2); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, -1, ptf, 2); expect(InvalidParameter, status); ptf[0].X = 1.0; @@ -4954,6 +4965,16 @@ ok(rect.X == 100.0 && rect.Y == 100.0 && rect.Width == 100.0 && rect.Height == 100.0, "expected 100.0,100.0-100.0,100.0, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + /* Clip region does not account for changes to gdi32 transform */ + SetViewportOrgEx(hdc, 10, 10, NULL); + + status = GdipGetClipBounds(graphics, &rect); + expect(Ok, status); + ok(rect.X == 100.0 && rect.Y == 100.0 && rect.Width == 100.0 && rect.Height == 100.0, + "expected 100.0,100.0-100.0,100.0, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + + SetViewportOrgEx(hdc, 0, 0, NULL); + status = GdipSetEmpty(region); expect(Ok, status); status = GdipGetClip(graphics, region); @@ -6155,11 +6176,380 @@ ReleaseDC(hwnd, hdc); } +static void test_GdipGraphicsSetAbort(void) +{ + HDC hdc; + GpStatus status; + GpGraphics *graphics; + + if (!pGdipGraphicsSetAbort) + { + win_skip("GdipGraphicsSetAbort() is not supported.\n"); + return; + } + + hdc = GetDC(hwnd); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = pGdipGraphicsSetAbort(NULL, NULL); + expect(InvalidParameter, status); + + status = pGdipGraphicsSetAbort(graphics, NULL); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + +#define BLUE_COLOR (0xff0000ff) +#define is_blue_color(color) ( ((color) & 0x00ffffff) == 0xff ) +#define get_bitmap_pixel(x,y) pixel[(y)*(width) + (x)] +static DWORD* GetBitmapPixelBuffer(HDC hdc, HBITMAP hbmp, int width, int height) +{ + BITMAPINFOHEADER bi; + UINT lines = 0; + DWORD *buffer = (DWORD *)GdipAlloc(width*height*4); + + bi.biSize = sizeof(BITMAPINFOHEADER); + bi.biWidth = width; + bi.biHeight = -height; /*very Important, set negative, indicating a top-down DIB*/ + bi.biPlanes = 1; + bi.biBitCount = 32; + bi.biCompression = BI_RGB; + bi.biSizeImage = 0; + bi.biXPelsPerMeter = 0; + bi.biYPelsPerMeter = 0; + bi.biClrUsed = 0; + bi.biClrImportant = 0; + + lines = GetDIBits(hdc, hbmp, 0, height, buffer, (BITMAPINFO *)&bi, DIB_RGB_COLORS); + ok(lines == height, "Expected GetDIBits:%p,%d->%d,%d\n", buffer, height, lines, GetLastError()); + + return buffer; +} + +static void ReleaseBitmapPixelBuffer(DWORD* buffer) +{ + if (buffer) GdipFree(buffer); +} + +static void test_GdipFillRectanglesOnMemoryDCSolidBrush(void) +{ + ARGB color[6] = {0,0,0,0,0,0}; + POINT pt = {0,0}; + RECT rect = {100, 100, 180, 180}; + UINT width = rect.right - rect.left; + UINT height = rect.bottom - rect.top; + GpStatus status = 0; + GpSolidFill *brush = NULL; + GpGraphics *graphics = NULL; + HDC dc = GetDC( hwnd); + HDC hdc = CreateCompatibleDC(dc); + HBITMAP bmp = CreateCompatibleBitmap(dc, width, height); + HGDIOBJ old = SelectObject(hdc, bmp); + DWORD* pixel = NULL; + + /*Change the window origin is the key test point*/ + SetWindowOrgEx(hdc, rect.left, rect.top, &pt); + + status = GdipCreateSolidFill(BLUE_COLOR, &brush); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipSetClipRectI(graphics, rect.left+width/2, rect.top+height/2, + width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipFillRectangleI(graphics, (GpBrush*)brush, 0, 0, rect.right, rect.bottom); + expect(Ok, status); + + GdipDeleteBrush((GpBrush*)brush); + GdipDeleteGraphics(graphics); + + pixel = GetBitmapPixelBuffer(hdc, bmp, width, height); + if (pixel) + { + color[0] = get_bitmap_pixel(width/2, height/2); + color[1] = get_bitmap_pixel(width/2+1, height/2); + color[2] = get_bitmap_pixel(width/2, height/2+1); + color[3] = get_bitmap_pixel(width/2-1, height/2-1); + color[4] = get_bitmap_pixel(width/2-1, height-1); + color[5] = get_bitmap_pixel(width-1, height/2-1); + } + + ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + color[3] == 0 && color[4] == 0 && color[5] == 0, + "Expected GdipFillRectangleI take effect!\n" ); + ReleaseBitmapPixelBuffer(pixel); + + SelectObject(hdc, old); + DeleteObject(bmp); + DeleteDC(hdc); + ReleaseDC(hwnd, dc); +} + +static void test_GdipFillRectanglesOnMemoryDCTextureBrush(void) +{ + ARGB color[6] = {0,0,0,0,0,0}; + POINT pt = {0,0}; + RECT rect = {100, 100, 180, 180}; + UINT width = rect.right - rect.left; + UINT height = rect.bottom - rect.top; + GpStatus status = 0; + union + { + GpBitmap *bitmap; + GpImage *image; + } src_img; + GpTexture *brush = NULL; + GpGraphics *graphics = NULL; + HDC dc = GetDC( hwnd); + HDC hdc = CreateCompatibleDC(dc); + HBITMAP bmp = CreateCompatibleBitmap(dc, width, height); + HGDIOBJ old = SelectObject(hdc, bmp); + + UINT x = 0; + UINT y = 0; + UINT src_img_width = width/2; + UINT src_img_height = height/2; + BYTE *src_img_data = GdipAlloc(src_img_width*src_img_height*4); + DWORD *pixel = (DWORD *)src_img_data; + ok(pixel != NULL, "Expected src_img_data is valid\n"); + + /*Change the window origin is the key test point*/ + SetWindowOrgEx(hdc, rect.left, rect.top, &pt); + + /*build a blue solid image!*/ + for(y = 0; y < src_img_height; ++y) + { + for(x = 0; x < src_img_width; ++x) + { + pixel[x] = BLUE_COLOR; + } + + pixel += src_img_width; + } + + status = GdipCreateBitmapFromScan0(src_img_width, src_img_height, src_img_width*4, + PixelFormat32bppARGB, src_img_data, &src_img.bitmap); + expect(Ok, status); + + status = GdipCreateTexture(src_img.image, 0, &brush); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipSetClipRectI(graphics, rect.left+width/2, rect.top+height/2, + width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipFillRectangleI(graphics, (GpBrush*)brush, 0, 0, rect.right, rect.bottom); + expect(Ok, status); + + GdipDisposeImage(src_img.image); + GdipDeleteBrush((GpBrush*)brush); + GdipDeleteGraphics(graphics); + GdipFree(src_img_data); + + pixel = GetBitmapPixelBuffer(hdc, bmp, width, height); + if (pixel) + { + color[0] = get_bitmap_pixel(width/2, height/2); + color[1] = get_bitmap_pixel(width/2+1, height/2); + color[2] = get_bitmap_pixel(width/2, height/2+1); + color[3] = get_bitmap_pixel(width/2-1, height/2-1); + color[4] = get_bitmap_pixel(width/2-1, height-1); + color[5] = get_bitmap_pixel(width-1, height/2-1); + } + ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + color[3] == 0 && color[4] == 0 && color[5] == 0, + "Expected GdipFillRectangleI take effect!\n" ); + ReleaseBitmapPixelBuffer(pixel); + + SelectObject(hdc, old); + DeleteObject(bmp); + DeleteDC(hdc); + ReleaseDC(hwnd, dc); +} + +static void test_GdipFillRectanglesOnBitmapTextureBrush(void) +{ + ARGB color[6] = {0,0,0,0,0,0}; + UINT x = 0; + UINT y = 0; + RECT rect = {100, 100, 180, 180}; + UINT width = rect.right - rect.left; + UINT height = rect.bottom - rect.top; + UINT src_img_width = width/2; + UINT src_img_height = height/2; + + GpStatus status = 0; + union + { + GpBitmap *bitmap; + GpImage *image; + } src_img; + union + { + GpBitmap *bitmap; + GpImage *image; + } dst_img; + + GpTexture *brush = NULL; + GpGraphics *graphics = NULL; + BYTE *src_img_data = GdipAlloc(src_img_width*src_img_height*4); + DWORD *pixel = (DWORD *)src_img_data; + ok(pixel != NULL, "Expected src_img_data is valid\n"); + + status = GdipCreateBitmapFromScan0(width, height, width*4, + PixelFormat32bppARGB, NULL, &dst_img.bitmap); + expect(Ok, status); + + /*build a blue solid image!*/ + for(y = 0; y < src_img_height; ++y) + { + for(x = 0; x < src_img_width; ++x) + { + pixel[x] = BLUE_COLOR; + } + + pixel += src_img_width; + } + + status = GdipCreateBitmapFromScan0(src_img_width, src_img_height, src_img_width*4, + PixelFormat32bppARGB, src_img_data, &src_img.bitmap); + expect(Ok, status); + + status = GdipCreateTexture(src_img.image, 0, &brush); + expect(Ok, status); + + status = GdipGetImageGraphicsContext(dst_img.image, &graphics); + expect(Ok, status); + + status = GdipSetClipRectI(graphics, 0, 0, width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipFillRectangleI(graphics, (GpBrush*)brush, 0, 0, width/2, height/2); + expect(Ok, status); + + GdipDeleteBrush((GpBrush*)brush); + GdipDeleteGraphics(graphics); + + GdipBitmapGetPixel(dst_img.bitmap, 0, 0, &color[0]); + GdipBitmapGetPixel(dst_img.bitmap, 0, 1, &color[1]); + GdipBitmapGetPixel(dst_img.bitmap, 1, 0, &color[2]); + GdipBitmapGetPixel(dst_img.bitmap, width/2, 0, &color[3]); + GdipBitmapGetPixel(dst_img.bitmap, width/2, height/2, &color[4]); + GdipBitmapGetPixel(dst_img.bitmap, 0, height/2, &color[5]); + + ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + color[3] == 0 && color[4] == 0 && color[5] == 0, + "Expected GdipFillRectangleI take effect!\n" ); + + GdipDisposeImage(src_img.image); + GdipDisposeImage(dst_img.image); + GdipFree(src_img_data); +} + +static void test_GdipDrawImagePointsRectOnMemoryDC(void) +{ + ARGB color[6] = {0,0,0,0,0,0}; + POINT pt = {0,0}; + RECT rect = {100, 100, 180, 180}; + UINT width = rect.right - rect.left; + UINT height = rect.bottom - rect.top; + GpStatus status = 0; + union + { + GpBitmap *bitmap; + GpImage *image; + } src_img; + GpGraphics *graphics = NULL; + HDC dc = GetDC( hwnd); + HDC hdc = CreateCompatibleDC(dc); + HBITMAP bmp = CreateCompatibleBitmap(dc, width, height); + HGDIOBJ old = SelectObject(hdc, bmp); + + UINT x = 0; + UINT y = 0; + UINT src_img_width = width/2; + UINT src_img_height = height/2; + BYTE *src_img_data = GdipAlloc(src_img_width*src_img_height*4); + DWORD *pixel = (DWORD *)src_img_data; + ok(pixel != NULL, "Expected src_img_data is valid\n"); + + /*Change the window origin is the key test point*/ + SetWindowOrgEx(hdc, rect.left, rect.top, &pt); + + /*build a blue solid image!*/ + for(y = 0; y < src_img_height; ++y) + { + for(x = 0; x < src_img_width; ++x) + { + pixel[x] = BLUE_COLOR; + } + + pixel += src_img_width; + } + + status = GdipCreateBitmapFromScan0(src_img_width, src_img_height, src_img_width*4, + PixelFormat32bppARGB, src_img_data, &src_img.bitmap); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipDrawImageRectRectI(graphics, src_img.image, + rect.left+width/2, rect.top+height/2, width/2, height/2, + 0, 0, src_img_width, src_img_height, UnitPixel, NULL, NULL, NULL); + expect(Ok, status); + + GdipDisposeImage(src_img.image); + GdipDeleteGraphics(graphics); + GdipFree(src_img_data); + + pixel = GetBitmapPixelBuffer(hdc, bmp, width, height); + if (pixel) + { + color[0] = get_bitmap_pixel(width/2, height/2); + color[1] = get_bitmap_pixel(width/2+1, height/2); + color[2] = get_bitmap_pixel(width/2, height/2+1); + color[3] = get_bitmap_pixel(width/2-1, height/2-1); + color[4] = get_bitmap_pixel(width/2-1, height-1); + color[5] = get_bitmap_pixel(width-1, height/2-1); + } + ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + color[3] == 0 && color[4] == 0 && color[5] == 0, + "Expected GdipDrawImageRectRectI take effect!\n" ); + ReleaseBitmapPixelBuffer(pixel); + + SelectObject(hdc, old); + DeleteObject(bmp); + DeleteDC(hdc); + ReleaseDC(hwnd, dc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; WNDCLASSA class; + HMODULE gdiplus_mod = GetModuleHandleA("gdiplus.dll"); + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); + + pGdipGraphicsSetAbort = (void*)GetProcAddress(gdiplus_mod, "GdipGraphicsSetAbort"); memset( &class, 0, sizeof(class) ); class.lpszClassName = "gdiplus_test"; @@ -6228,7 +6618,12 @@ test_bitmapfromgraphics(); test_GdipFillRectangles(); test_GdipGetVisibleClipBounds_memoryDC(); + test_GdipFillRectanglesOnMemoryDCSolidBrush(); + test_GdipFillRectanglesOnMemoryDCTextureBrush(); + test_GdipFillRectanglesOnBitmapTextureBrush(); + test_GdipDrawImagePointsRectOnMemoryDC(); test_container_rects(); + test_GdipGraphicsSetAbort(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd ); Modified: trunk/rostests/winetests/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphicspath.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -1071,6 +1071,17 @@ {5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ }; +static path_test_t widenline_dash_path[] = { + {5.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {35.0, 0.0, PathPointTypeLine, 0, 0}, /*1*/ + {35.0, 10.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 10.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {45.0, 0.0, PathPointTypeStart, 0, 0}, /*4*/ + {50.0, 0.0, PathPointTypeLine, 0, 0}, /*5*/ + {50.0, 10.0, PathPointTypeLine, 0, 0}, /*6*/ + {45.0, 10.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + }; + static void test_widen(void) { GpStatus status; @@ -1145,6 +1156,22 @@ status = GdipScaleMatrix(m, 1.0, 0.5, MatrixOrderAppend); expect(Ok, status); + /* dashed line */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 5.0, 50.0, 5.0); + expect(Ok, status); + + status = GdipSetPenDashStyle(pen, DashStyleDash); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_dash_path, sizeof(widenline_dash_path)/sizeof(path_test_t), FALSE); + + status = GdipSetPenDashStyle(pen, DashStyleSolid); + expect(Ok, status); + /* pen width in UnitWorld */ GdipDeletePen(pen); status = GdipCreatePen1(0xffffffff, 10.0, UnitWorld, &pen); @@ -1308,6 +1335,13 @@ { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -5376,6 +5376,13 @@ HMODULE mod = GetModuleHandleA("gdiplus.dll"); struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; Modified: trunk/rostests/winetests/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/matrix.… ============================================================================== --- trunk/rostests/winetests/gdiplus/matrix.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/matrix.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -34,6 +34,22 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + static void test_constructor_destructor(void) { GpStatus status; @@ -135,6 +151,7 @@ GpMatrix *matrix = NULL; GpMatrix *inverted = NULL; BOOL equal = FALSE; + REAL elems[6]; /* NULL */ status = GdipInvertMatrix(NULL); @@ -153,6 +170,18 @@ GdipCreateMatrix2(2.0/16.0, 2.0/16.0, -5.0/16.0, 3.0/16.0, 3.0/16.0, -21.0/16.0, &inverted); GdipIsMatrixEqual(matrix, inverted, &equal); expect(TRUE, equal); + + GdipCreateMatrix2(0.0006, 0, 0, 0.0006, 400, 400, &matrix); + status = GdipInvertMatrix(matrix); + expect(Ok, status); + status = GdipGetMatrixElements(matrix, elems); + expect(Ok, status); + ok(compare_float(elems[0], 1666.666504, 1), "elems[0] = %.10g\n", elems[0]); + ok(compare_float(elems[1], 0, 0), "elems[1] = %.10g\n", elems[1]); + ok(compare_float(elems[2], 0, 0), "elems[2] = %.10g\n", elems[2]); + ok(compare_float(elems[3], 1666.666504, 1), "elems[3] = %.10g\n", elems[3]); + ok(compare_float(elems[4], -666666.6875, 1), "elems[4] = %.10g\n", elems[4]); + ok(compare_float(elems[5], -666666.6875, 1), "elems[5] = %.10g\n", elems[5]); GdipDeleteMatrix(inverted); GdipDeleteMatrix(matrix); @@ -350,6 +379,13 @@ { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; Modified: trunk/rostests/winetests/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/metafil… ============================================================================== --- trunk/rostests/winetests/gdiplus/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/metafile.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -69,6 +69,39 @@ DWORD DataSize; } EmfPlusRecordHeader; +typedef enum +{ + ObjectTypeInvalid, + ObjectTypeBrush, + ObjectTypePen, + ObjectTypePath, + ObjectTypeRegion, + ObjectTypeImage, + ObjectTypeFont, + ObjectTypeStringFormat, + ObjectTypeImageAttributes, + ObjectTypeCustomLineCap, +} ObjectType; + +typedef enum +{ + ImageDataTypeUnknown, + ImageDataTypeBitmap, + ImageDataTypeMetafile, +} ImageDataType; + +typedef struct +{ + EmfPlusRecordHeader Header; + /* EmfPlusImage */ + DWORD Version; + ImageDataType Type; + /* EmfPlusMetafile */ + DWORD MetafileType; + DWORD MetafileDataSize; + BYTE MetafileData[1]; +} MetafileImageObject; + static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, int nObj, LPARAM lpData) { @@ -102,12 +135,28 @@ actual.record_type = record->Type; check_record(state->count, state->desc, &state->expected[state->count], &actual); - state->count++; + + if (state->expected[state->count-1].todo && state->expected[state->count-1].record_type != actual.record_type) + continue; } else { ok(0, "%s: Unexpected EMF+ 0x%x record\n", state->desc, record->Type); + } + + if ((record->Flags >> 8) == ObjectTypeImage && record->Type == EmfPlusRecordTypeObject) + { + const MetafileImageObject *image = (const MetafileImageObject*)record; + + if (image->Type == ImageDataTypeMetafile) + { + HENHMETAFILE hemf = SetEnhMetaFileBits(image->MetafileDataSize, image->MetafileData); + ok(hemf != NULL, "%s: SetEnhMetaFileBits failed\n", state->desc); + + EnumEnhMetaFile(0, hemf, enum_emf_proc, state, NULL); + DeleteEnhMetaFile(hemf); + } } offset += record->Size; @@ -645,6 +694,26 @@ {0} }; +static const emfplus_record emfonly_draw_records[] = { + {0, EMR_HEADER}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_SETMITERLIMIT}, + {1, EMR_MODIFYWORLDTRANSFORM}, + {1, EMR_EXTCREATEPEN}, + {1, EMR_SELECTOBJECT}, + {1, EMR_SELECTOBJECT}, + {1, EMR_POLYLINE16}, + {1, EMR_SELECTOBJECT}, + {1, EMR_SELECTOBJECT}, + {1, EMR_MODIFYWORLDTRANSFORM}, + {1, EMR_DELETEOBJECT}, + {1, EMR_SETMITERLIMIT}, + {1, EMR_RESTOREDC}, + {0, EMR_EOF}, + {1} +}; + static void test_emfonly(void) { GpStatus stat; @@ -663,6 +732,7 @@ HBRUSH hbrush, holdbrush; GpBitmap *bitmap; ARGB color; + GpPen *pen; hdc = CreateCompatibleDC(0); @@ -905,6 +975,35 @@ stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); + + /* test drawing to metafile with gdi+ functions */ + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, stat); + stat = GdipDrawLineI(graphics, pen, 0, 0, 10, 10); + todo_wine expect(Ok, stat); + GdipDeletePen(pen); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, emfonly_draw_records, "emfonly draw metafile", dst_points, &frame, UnitPixel); + sync_metafile(&metafile, "emfonly_draw.emf"); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); } static const emfplus_record fillrect_records[] = { @@ -2060,6 +2159,8 @@ {0, EmfPlusRecordTypeRestore}, {0, EmfPlusRecordTypeSetClipRect}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeObject, 1}, + {0, EmfPlusRecordTypeSetClipRegion, 1}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, {0} @@ -2071,7 +2172,9 @@ GpMetafile *metafile; GpGraphics *graphics; GpBitmap *bitmap; + GpRegion *region; GpBrush *brush; + GpRectF rect; ARGB color; HDC hdc; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; @@ -2095,9 +2198,23 @@ stat = GdipSaveGraphics(graphics, &state); expect(Ok, stat); + stat = GdipGetVisibleClipBounds(graphics, &rect); + expect(Ok, stat); + ok(rect.X == -0x400000, "rect.X = %f\n", rect.X); + ok(rect.Y == -0x400000, "rect.Y = %f\n", rect.Y); + ok(rect.Width == 0x800000, "rect.Width = %f\n", rect.Width); + ok(rect.Height == 0x800000, "rect.Height = %f\n", rect.Height); + stat = GdipSetClipRect(graphics, 30, 30, 10, 10, CombineModeReplace); expect(Ok, stat); + stat = GdipGetVisibleClipBounds(graphics, &rect); + expect(Ok, stat); + ok(rect.X == 30, "rect.X = %f\n", rect.X); + ok(rect.Y == 30, "rect.Y = %f\n", rect.Y); + ok(rect.Width == 10, "rect.Width = %f\n", rect.Width); + ok(rect.Height == 10, "rect.Height = %f\n", rect.Height); + stat = GdipCreateSolidFill((ARGB)0xff000000, (GpSolidFill**)&brush); expect(Ok, stat); @@ -2120,6 +2237,15 @@ expect(Ok, stat); stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipCreateRegionRect(&rect, &region); + expect(Ok, stat); + + stat = GdipSetClipRegion(graphics, region, CombineModeIntersect); + expect(Ok, stat); + + stat = GdipDeleteRegion(region); expect(Ok, stat); stat = GdipDeleteGraphics(graphics); @@ -2277,12 +2403,389 @@ expect(Ok, stat); } +static const emfplus_record draw_image_bitmap_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeDrawImagePoints}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static const emfplus_record draw_image_metafile_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeObject}, + /* metafile object */ + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeDrawImagePoints}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + /* end of metafile object */ + {0, EmfPlusRecordTypeDrawImagePoints}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_drawimage(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpPointF dst_points[3] = {{10.0,10.0},{85.0,15.0},{10.0,80.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + const ColorMatrix double_red = {{ + {2.0,0.0,0.0,0.0,0.0}, + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; + + GpImageAttributes *imageattr; + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + BITMAPINFO info; + BYTE buff[400]; + GpImage *image; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + memset(&info, 0, sizeof(info)); + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = 10; + info.bmiHeader.biHeight = 10; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + memset(buff, 0x80, sizeof(buff)); + stat = GdipCreateBitmapFromGdiDib(&info, buff, (GpBitmap**)&image); + expect(Ok, stat); + + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &double_red, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, image, dst_points, 3, + 0.0, 0.0, 10.0, 10.0, UnitPixel, imageattr, NULL, NULL); + GdipDisposeImageAttributes(imageattr); + expect(Ok, stat); + + GdipDisposeImage(image); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_image_bitmap.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, draw_image_bitmap_records, "draw image bitmap"); + + /* test drawing metafile */ + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateMetafileFromEmf(hemf, TRUE, (GpMetafile**)&image); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, image, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + expect(Ok, stat); + + GdipDisposeImage(image); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_image_metafile.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + if (GetProcAddress(GetModuleHandleA("gdiplus.dll"), "GdipConvertToEmfPlus")) + { + check_emfplus(hemf, draw_image_metafile_records, "draw image metafile"); + } + else + { + win_skip("draw image metafile records tests skipped\n"); + } + DeleteEnhMetaFile(hemf); + + DeleteDC(hdc); + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + +static const emfplus_record properties_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeSetTextRenderingHint}, + {0, EmfPlusRecordTypeSetPixelOffsetMode}, + {0, EmfPlusRecordTypeSetAntiAliasMode}, + {0, EmfPlusRecordTypeSetCompositingMode}, + {0, EmfPlusRecordTypeSetCompositingQuality}, + {0, EmfPlusRecordTypeSetInterpolationMode}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_properties(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipSetTextRenderingHint(graphics, TextRenderingHintSystemDefault); + expect(Ok, stat); + stat = GdipSetTextRenderingHint(graphics, TextRenderingHintAntiAlias); + expect(Ok, stat); + + stat = GdipSetPixelOffsetMode(graphics, PixelOffsetModeHighQuality); + expect(Ok, stat); + stat = GdipSetPixelOffsetMode(graphics, PixelOffsetModeHighQuality); + expect(Ok, stat); + + stat = GdipSetSmoothingMode(graphics, SmoothingModeAntiAlias); + expect(Ok, stat); + stat = GdipSetSmoothingMode(graphics, SmoothingModeAntiAlias); + expect(Ok, stat); + + stat = GdipSetCompositingMode(graphics, CompositingModeSourceOver); + expect(Ok, stat); + stat = GdipSetCompositingMode(graphics, CompositingModeSourceCopy); + expect(Ok, stat); + + stat = GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + expect(Ok, stat); + stat = GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + expect(Ok, stat); + + stat = GdipSetInterpolationMode(graphics, InterpolationModeDefault); + expect(Ok, stat); + stat = GdipSetInterpolationMode(graphics, InterpolationModeHighQuality); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "properties.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, properties_records, "properties"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + +static const emfplus_record draw_path_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeDrawPath}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_drawpath(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + GpPath *path; + GpPen *pen; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathLine(path, 5, 5, 30, 30); + expect(Ok, stat); + + stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, stat); + + stat = GdipDrawPath(graphics, pen, path); + expect(Ok, stat); + + stat = GdipDeletePen(pen); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_path.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, draw_path_records, "draw path"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + +static const emfplus_record fill_path_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeFillPath}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_fillpath(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const WCHAR winetestemfW[] = {'w','i','n','e','t','e','s','t','.','e','m','f',0}; + + GpMetafile *metafile; + GpGraphics *graphics; + GpSolidFill *brush; + HENHMETAFILE hemf; + GpStatus stat; + GpPath *path; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathLine(path, 5, 5, 30, 30); + expect(Ok, stat); + stat = GdipAddPathLine(path, 30, 30, 5, 30); + expect(Ok, stat); + + stat = GdipCreateSolidFill(0xffaabbcc, &brush); + expect(Ok, stat); + + stat = GdipFillPath(graphics, (GpBrush*)brush, path); + expect(Ok, stat); + + stat = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "fill_path.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, fill_path_records, "fill path"); + + /* write to disk */ + DeleteEnhMetaFile(CopyEnhMetaFileW(hemf, winetestemfW)); + + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + /* should succeed when given path to an EMF */ + stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + DeleteFileW(winetestemfW); + + stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + expect(GenericError, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; int myARGC; char **myARGV; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; @@ -2314,6 +2817,10 @@ test_containers(); test_clipping(); test_gditransform(); + test_drawimage(); + test_properties(); + test_drawpath(); + test_fillpath(); GdiplusShutdown(gdiplusToken); } Modified: trunk/rostests/winetests/gdiplus/pathiterator.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pathite… ============================================================================== --- trunk/rostests/winetests/gdiplus/pathiterator.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/pathiterator.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -565,6 +565,13 @@ { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; Modified: trunk/rostests/winetests/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pen.c?r… ============================================================================== --- trunk/rostests/winetests/gdiplus/pen.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/pen.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -461,6 +461,13 @@ { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); test_startup(); Modified: trunk/rostests/winetests/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/region.… ============================================================================== --- trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -42,7 +42,7 @@ #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) -#define expect_magic(value) ok(*(value) == RGNDATA_MAGIC || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) +#define expect_magic(value) ok(broken(*(value) == RGNDATA_MAGIC) || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) #define expect_dword(value, expected) expect((expected), *(value)) #define expect_float(value, expected) expectf((expected), *(FLOAT *)(value)) @@ -1123,6 +1123,8 @@ GpGraphics *graphics; HRGN hrgn; HDC hdc=GetDC(0); + INT rgntype; + RECT rgnbox; static const RECT empty_rect = {0,0,0,0}; static const RECT test_rect = {10, 11, 20, 21}; static const GpRectF test_rectF = {10.0, 11.0, 10.0, 10.0}; @@ -1243,6 +1245,35 @@ ok(status == Ok, "status %08x\n", status); status = GdipDeleteGraphics(graphics); ok(status == Ok, "status %08x\n", status); + + /* test with gdi32 transform */ + SetViewportOrgEx(hdc, 10, 10, NULL); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateRegionRect(&test_rectF, &region); + expect(Ok, status); + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + expect(Ok, status); + + rgntype = GetRgnBox(hrgn, &rgnbox); + DeleteObject(hrgn); + + expect(SIMPLEREGION, rgntype); + expect(20, rgnbox.left); + expect(21, rgnbox.top); + expect(30, rgnbox.right); + expect(31, rgnbox.bottom); + + status = GdipDeleteRegion(region); + expect(Ok, status); + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + + SetViewportOrgEx(hdc, 0, 0, NULL); + ReleaseDC(0, hdc); } @@ -2267,6 +2298,13 @@ { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; Modified: trunk/rostests/winetests/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/stringf… ============================================================================== --- trunk/rostests/winetests/gdiplus/stringformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/stringformat.c [iso-8859-1] Sun Sep 17 12:34:24 2017 @@ -444,6 +444,13 @@ { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + HMODULE hmsvcrt; + int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); + + /* Enable all FP exceptions except _EM_INEXACT, which gdi32 can trigger */ + hmsvcrt = LoadLibraryA("msvcrt"); + _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); + if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL;

1 0

[akhaldi] 75872: [GDIPLUS] Sync with Wine Staging 2.16. CORE-13762 6bf1b63 gdiplus: Account for gdi32 transform in SOFTWARE_GdipDrawThinPath. e127101 gdiplus: Send paths to gdi32 in device coordina...
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 12:34:15 2017 New Revision: 75872 URL: http://svn.reactos.org/svn/reactos?rev=75872&view=rev Log: [GDIPLUS] Sync with Wine Staging 2.16. CORE-13762 6bf1b63 gdiplus: Account for gdi32 transform in SOFTWARE_GdipDrawThinPath. e127101 gdiplus: Send paths to gdi32 in device coordinates. 93e8507 gdiplus: Account for gdi32 transform in GdipDrawImage. be95252 gdiplus: Use SOFTWARE_GdipDrawPath with alpha hdc's. 0914f62 gdiplus: Account for gdi transform in brush_fill_pixels. 399fd55 gdiplus: Account for gdi transform in SOFTWARE_GdipFillRegion. 016dc76 gdiplus: Transform clipping region to gdi device coordinates. cfa4f08 gdiplus: Replace DPtoLP with an internal coordinate space constant. 5c12ced gdiplus: Check for invalid coordinate space in GdipTransformPoints. 8c593bd gdiplus: Set correct color space flags for grayscale images. 7860d11 gdiplus: Don't call PlayEnhMetaFileRecord for records handled by gdiplus. 5870431 gdiplus: Force conversion of 8 bpp grayscale PNG images to 32 bpp BGRA. 42e5d27 gdiplus: Use defined constants for wrap modes. 79ebd3f gdiplus: Fix copy-paste typo. a4ab858 gdiplus: GdipCreateMetafileFromWmfFile will also load EMFs. aac33da gdiplus: Implement transform matrix for line gradient brushes. 14bb8df gdiplus: Support GdipSetClipRegion in metafiles. 4a02870 gdiplus: Add write_region_data helper and use it in GdipGetRegionData. 595959c gdiplus: Add more accurate algorithm for inverting scaling and translation matrices in GdipInvertMatrix. 1744277 gdiplus: Implement stub for GdipGraphicsSetAbort. 331a7af gdiplus: Fix a possible floating point exception in path gradients. 400cfb0 gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath. 2176348 gdiplus: Return success saving path to metafile. 70afb4e gdiplus: Fix saving pen dashed line cap style to metafile. a172cc6 gdiplus: Free dash_pattern_scaled (Coverity). 58eb74c gdiplus: Use write_path_data helper in GdipGetRegionData. a892b68 gdiplus: Add write_path_data helper to create EMF+ path object. 5545332 gdiplus: Store newer gdi+ version in created GdipRegions. cfe2b3f gdiplus: Don't require specific gdi+ versions in metafile structures. a8b5fdd gdiplus: Use VERSION_MAGIC2 constant in metafiles functions. 8498aa3 gdiplus: Add support for creating image object containing metafile. 9f22041 gdiplus: Fix leak in widen_dashed_figure. f9b881e gdiplus: Fix GdipGetVisibleClipBounds behavior on metafiles. de37ced gdiplus: Add partial support for GdipFillPath on metafiles. e79c4ca gdiplus: Add partial support for GdipDrawPath on metafiles. 7d6896e gdiplus: Add helper for saving pens to metafile. e502a8d gdiplus: Add helper for saving path objects in metafile. 8608bf5 gdiplus: Add DrawPath stub for metafiles. 29968cf gdiplus: Support GdipSetInterpolationMode in metafiles. f248374 gdiplus: Support GdipSetCompositingQuality in metafiles. 1cecd47 gdiplus: Support GdipSetCompositingMode in metafiles. 910975a gdiplus: Support GdipSetSmoothingMode in metafiles. f716029 gdiplus: Support GdipSetPixelOffsetMode in metafiles. 683315d gdiplus: Support GdipSetTextRenderingHint in metafiles. 689268d gdiplus: Add support for ImageAttributes when drawing image to metafile. ac231b1 gdiplus: Add function for managing metafile objects id. e1e4dd2 gdiplus: Add partial support for GdipDrawImagePointsRect on metafile. 1a75f76 gdiplus: Remove unused clsid parameter from encode_image_func helpers. 01c9fb9 gdiplus: Remove a duplicate word in a comment. 6ec3cd9 gdiplus: Set flatness more appropriately in GdipDrawPath. 7e1522c gdiplus: Scale widened dashes to the pen width. c95877d gdiplus: Write API documentation for GdipAddPathArc and GdipAddPathArcI. f1123f3 gdiplus: Write API for GdipClonePath. f96e319 gdiplus: Write API for GdipAddPathLine and GdipAddPathLineI. 260cbd0 gdiplus: Implement triangular line caps in widened paths. a4b7fe6 gdiplus: Initialize containers list in GdipCloneImage. Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/matrix.c trunk/reactos/dll/win32/gdiplus/metafile.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… Modified: trunk/reactos/dll/win32/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/matrix.c… Modified: trunk/reactos/dll/win32/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/metafile… Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 75871: [PSDK] Update gdiplusflat.h. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 12:34:07 2017 New Revision: 75871 URL: http://svn.reactos.org/svn/reactos?rev=75871&view=rev Log: [PSDK] Update gdiplusflat.h. CORE-13762 Modified: trunk/reactos/sdk/include/psdk/gdiplusflat.h Modified: trunk/reactos/sdk/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusfl… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusflat.h [iso-8859-1] Sun Sep 17 12:34:07 2017 @@ -263,6 +263,7 @@ GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB); +GpStatus WINGDIPAPI GdipGraphicsSetAbort(GpGraphics*,GdiplusAbort*); GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*); GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*); GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*); @@ -495,6 +496,7 @@ GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient*,ARGB*,REAL*,INT); GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient*,INT*); GpStatus WINGDIPAPI GdipGetLineTransform(GpLineGradient*,GpMatrix*); +GpStatus WINGDIPAPI GdipMultiplyLineTransform(GpLineGradient*,GDIPCONST GpMatrix*,GpMatrixOrder); GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient*); GpStatus WINGDIPAPI GdipRotateLineTransform(GpLineGradient*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient*,REAL,REAL,

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
29
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017