Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 58287: - Disable assert CORE-6866
by janderwald＠svn.reactos.org 04 Feb '13

04 Feb '13

Author: janderwald Date: Mon Feb 4 12:39:40 2013 New Revision: 58287 URL: http://svn.reactos.org/svn/reactos?rev=58287&view=rev Log: - Disable assert CORE-6866 Modified: trunk/reactos/win32ss/gdi/eng/mouse.c Modified: trunk/reactos/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mouse.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] Mon Feb 4 12:39:40 2013 @@ -661,7 +661,7 @@ psurfMask = SURFACE_ShareLockSurface(hbmMask); else { - ASSERT(fl & SPS_ALPHA); + //ASSERT(fl & SPS_ALPHA); psurfMask = NULL; }

1 0

[janderwald] 58286: [EXPLORER] - Fix taskbar icons
by janderwald＠svn.reactos.org 04 Feb '13

04 Feb '13

Author: janderwald Date: Mon Feb 4 12:09:35 2013 New Revision: 58286 URL: http://svn.reactos.org/svn/reactos?rev=58286&view=rev Log: [EXPLORER] - Fix taskbar icons Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] Mon Feb 4 12:09:35 2013 @@ -516,33 +516,39 @@ for(set<int>::reverse_iterator it=btn_idx_to_delete.rbegin(); it!=btn_idx_to_delete.rend(); ++it) { int idx = *it; - SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0); - - for(TaskBarMap::iterator it=_map.begin(); it!=_map.end(); ++it) { - TaskBarEntry& entry = it->second; + if (!SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0)) + MessageBoxW(NULL, L"failed to delete button", NULL, MB_OK); + + + for(TaskBarMap::iterator it2=_map.begin(); it2!=_map.end(); ++it2) { + TaskBarEntry& entry = it2->second; // adjust button indexes if (entry._btn_idx > idx) { --entry._btn_idx; +#if 0 --entry._bmp_idx; - + TBBUTTONINFO info; info.cbSize = sizeof(TBBUTTONINFO); info.dwMask = TBIF_IMAGE; info.iImage = entry._bmp_idx; - SendMessage(_htoolbar, TB_SETBUTTONINFO, entry._id, (LPARAM)&info); + if (!SendMessage(_htoolbar, TB_SETBUTTONINFO, entry._id, (LPARAM)&info)) + MessageBoxW(NULL, L"failed to set button info", NULL, MB_OK); +#endif } } + } for(set<HBITMAP>::iterator it=hbmp_to_delete.begin(); it!=hbmp_to_delete.end(); ++it) { HBITMAP hbmp = *it; - +#if 0 TBREPLACEBITMAP tbrepl = {0, (UINT_PTR)hbmp, 0, 0}; SendMessage(_htoolbar, TB_REPLACEBITMAP, 0, (LPARAM)&tbrepl); - +#endif DeleteObject(hbmp); for(TaskBarMap::iterator it=_map.begin(); it!=_map.end(); ++it)

1 0

[akhaldi] 58285: [IMM32_WINETEST] * Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 03 Feb '13

03 Feb '13

Author: akhaldi Date: Sun Feb 3 20:58:19 2013 New Revision: 58285 URL: http://svn.reactos.org/svn/reactos?rev=58285&view=rev Log: [IMM32_WINETEST] * Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/imm32/imm32.c Modified: trunk/rostests/winetests/imm32/imm32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r… ============================================================================== --- trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] Sun Feb 3 20:58:19 2013 @@ -33,11 +33,16 @@ /* * msgspy - record and analyse message traces sent to a certain window */ +typedef struct _msgs { + CWPSTRUCT msg; + BOOL post; +} imm_msgs; + static struct _msg_spy { HWND hwnd; HHOOK get_msg_hook; HHOOK call_wnd_proc_hook; - CWPSTRUCT msgs[32]; + imm_msgs msgs[32]; unsigned int i_msg; } msg_spy; @@ -46,13 +51,14 @@ if (HC_ACTION == nCode) { MSG *msg = (MSG*)lParam; - if ((msg->hwnd == msg_spy.hwnd) && + if ((msg->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL) && (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) { - msg_spy.msgs[msg_spy.i_msg].hwnd = msg->hwnd; - msg_spy.msgs[msg_spy.i_msg].message = msg->message; - msg_spy.msgs[msg_spy.i_msg].wParam = msg->wParam; - msg_spy.msgs[msg_spy.i_msg].lParam = msg->lParam; + msg_spy.msgs[msg_spy.i_msg].msg.hwnd = msg->hwnd; + msg_spy.msgs[msg_spy.i_msg].msg.message = msg->message; + msg_spy.msgs[msg_spy.i_msg].msg.wParam = msg->wParam; + msg_spy.msgs[msg_spy.i_msg].msg.lParam = msg->lParam; + msg_spy.msgs[msg_spy.i_msg].post = TRUE; msg_spy.i_msg++; } } @@ -66,10 +72,11 @@ if (HC_ACTION == nCode) { CWPSTRUCT *cwp = (CWPSTRUCT*)lParam; - if ((cwp->hwnd == msg_spy.hwnd) && + if (((cwp->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL)) && (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) { - memcpy(&msg_spy.msgs[msg_spy.i_msg], cwp, sizeof(msg_spy.msgs[0])); + memcpy(&msg_spy.msgs[msg_spy.i_msg].msg, cwp, sizeof(msg_spy.msgs[0].msg)); + msg_spy.msgs[msg_spy.i_msg].post = FALSE; msg_spy.i_msg++; } } @@ -93,7 +100,7 @@ msg_spy.i_msg = 0; } -static CWPSTRUCT* msg_spy_find_msg(UINT message) { +static imm_msgs* msg_spy_find_next_msg(UINT message, UINT *start) { UINT i; msg_spy_pump_msg_queue(); @@ -102,11 +109,20 @@ fprintf(stdout, "%s:%d: msg_spy: message buffer overflow!\n", __FILE__, __LINE__); - for (i = 0; i < msg_spy.i_msg; i++) - if (msg_spy.msgs[i].message == message) + for (i = *start; i < msg_spy.i_msg; i++) + if (msg_spy.msgs[i].msg.message == message) + { + *start = i+1; return &msg_spy.msgs[i]; + } return NULL; +} + +static imm_msgs* msg_spy_find_msg(UINT message) { + UINT i = 0; + + return msg_spy_find_next_msg(message, &i); } static void msg_spy_init(HWND hwnd) { @@ -618,6 +634,73 @@ UnloadKeyboardLayout(hkl); } +static void test_ImmDefaultHwnd(void) +{ + HIMC imc1, imc2, imc3; + HWND def1, def3; + HWND hwnd; + + hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + + ShowWindow(hwnd, SW_SHOWNORMAL); + + imc1 = ImmGetContext(hwnd); + if (!imc1) + { + win_skip("IME support not implemented\n"); + return; + } + + def1 = ImmGetDefaultIMEWnd(hwnd); + + imc2 = ImmCreateContext(); + ImmSetOpenStatus(imc2, TRUE); + + imc3 = ImmGetContext(hwnd); + def3 = ImmGetDefaultIMEWnd(hwnd); + + ok(def3 == def1, "Default IME window should not change\n"); + ok(imc1 == imc3, "IME context should not change\n"); + ImmSetOpenStatus(imc2, FALSE); + + ImmReleaseContext(hwnd, imc1); + ImmReleaseContext(hwnd, imc3); + ImmDestroyContext(imc2); + DestroyWindow(hwnd); +} + +static void test_ImmMessages(void) +{ + CANDIDATEFORM cf; + imm_msgs *msg; + HWND defwnd; + HIMC imc; + UINT idx = 0; + + HWND hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + + ShowWindow(hwnd, SW_SHOWNORMAL); + defwnd = ImmGetDefaultIMEWnd(hwnd); + imc = ImmGetContext(hwnd); + + ImmSetOpenStatus(imc, TRUE); + msg_spy_flush_msgs(); + SendMessage(defwnd, WM_IME_CONTROL, IMC_GETCANDIDATEPOS, (LPARAM)&cf ); + do + { + msg = msg_spy_find_next_msg(WM_IME_CONTROL,&idx); + if (msg) ok(!msg->post, "Message should not be posted\n"); + } while (msg); + msg_spy_flush_msgs(); + ImmSetOpenStatus(imc, FALSE); + ImmReleaseContext(hwnd, imc); + DestroyWindow(hwnd); +} + START_TEST(imm32) { if (init()) { @@ -630,6 +713,12 @@ test_ImmIsUIMessage(); test_ImmGetContext(); test_ImmGetDescription(); + test_ImmDefaultHwnd(); + msg_spy_cleanup(); + /* Reinitialize the hooks to capture all windows */ + msg_spy_init(NULL); + test_ImmMessages(); + msg_spy_cleanup(); } cleanup(); }

1 0

[akhaldi] 58284: [IMM32] * Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 03 Feb '13

03 Feb '13

Author: akhaldi Date: Sun Feb 3 20:58:12 2013 New Revision: 58284 URL: http://svn.reactos.org/svn/reactos?rev=58284&view=rev Log: [IMM32] * Sync with Wine 1.5.19. Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] Sun Feb 3 20:58:12 2013 @@ -52,6 +52,7 @@ IMEINFO imeInfo; WCHAR imeClassName[17]; /* 16 character max */ ULONG uSelected; + HWND UIWnd; /* Function Pointers */ MAKE_FUNCPTR(ImeInquire); @@ -79,7 +80,6 @@ INPUTCONTEXT IMC; ImmHkl *immKbd; - HWND imeWnd; UINT lastVK; } InputContextData; @@ -112,6 +112,10 @@ static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; +static const WCHAR szwIME[] = {'I','M','E',0}; + +static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam); #define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) @@ -359,6 +363,8 @@ ptr->pImeDestroy(1); FreeLibrary(ptr->hIME); } + if (ptr->UIWnd) + DestroyWindow(ptr->UIWnd); HeapFree(GetProcessHeap(),0,ptr); } } @@ -374,6 +380,21 @@ WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); } +static void IMM_RegisterIMEClass(void) +{ + WNDCLASSW wndClass; + + ZeroMemory(&wndClass, sizeof(WNDCLASSW)); + + wndClass.style = CS_GLOBALCLASS; + wndClass.lpfnWndProc = (WNDPROC) DefIME_WindowProc; + wndClass.cbWndExtra = 2 * sizeof(LONG_PTR); + wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); + wndClass.lpszClassName = szwIME; + + RegisterClassW(&wndClass); +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); @@ -384,6 +405,7 @@ tlsIndex = TlsAlloc(); if (tlsIndex == TLS_OUT_OF_INDEXES) return FALSE; + IMM_RegisterIMEClass(); break; case DLL_THREAD_ATTACH: break; @@ -394,6 +416,7 @@ IMM_FreeThreadData(); IMM_FreeAllImmHkl(); TlsFree(tlsIndex); + UnregisterClassW(szwIME, NULL); break; } return TRUE; @@ -679,10 +702,6 @@ data->immKbd->uSelected --; data->immKbd->pImeSelect(hIMC, FALSE); SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0)); - - if (IMM_GetThreadData()->hwndDefault == data->imeWnd) - IMM_GetThreadData()->hwndDefault = NULL; - DestroyWindow(data->imeWnd); ImmDestroyIMCC(data->IMC.hCompStr); ImmDestroyIMCC(data->IMC.hCandInfo); @@ -1492,6 +1511,9 @@ */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { + if (IMM_GetThreadData()->hwndDefault == NULL) + IMM_GetThreadData()->hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, + szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); TRACE("Default is %p\n",IMM_GetThreadData()->hwndDefault); return IMM_GetThreadData()->hwndDefault; } @@ -2264,16 +2286,16 @@ data->IMC.cfCompForm = *lpCompForm; - if (IsWindowVisible(IMM_GetThreadData()->hwndDefault)) + if (IsWindowVisible(data->immKbd->UIWnd)) { reshow = TRUE; - ShowWindow(IMM_GetThreadData()->hwndDefault,SW_HIDE); + ShowWindow(data->immKbd->UIWnd,SW_HIDE); } /* FIXME: this is a partial stub */ if (reshow) - ShowWindow(IMM_GetThreadData()->hwndDefault,SW_SHOWNOACTIVATE); + ShowWindow(data->immKbd->UIWnd,SW_SHOWNOACTIVATE); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; @@ -2323,15 +2345,16 @@ if (!data) return FALSE; - if (data->imeWnd == NULL) + if (data->immKbd->UIWnd == NULL) { /* create the ime window */ - data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, + data->immKbd->UIWnd = CreateWindowExW( WS_EX_TOOLWINDOW, data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, data->immKbd->hIME, 0); - SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); - IMM_GetThreadData()->hwndDefault = data->imeWnd; - } + SetWindowLongPtrW(data->immKbd->UIWnd, IMMGWL_IMC, (LONG_PTR)data); + } + else if (fOpen) + SetWindowLongPtrW(data->immKbd->UIWnd, IMMGWL_IMC, (LONG_PTR)data); if (!fOpen != !data->IMC.fOpen) { @@ -2857,3 +2880,53 @@ FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; } + + +/* + * Window Proc for the Default IME window class + */ +static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + case WM_NCCREATE: + return TRUE; + case WM_IME_STARTCOMPOSITION: + case WM_IME_ENDCOMPOSITION: + case WM_IME_COMPOSITION: + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY: + case WM_IME_CONTROL: + case WM_IME_COMPOSITIONFULL: + case WM_IME_SELECT: + case WM_IME_CHAR: + case WM_IME_REQUEST: + case WM_IME_KEYDOWN: + case WM_IME_KEYUP: + { + ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); + if (immHkl->UIWnd) + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; + } + default: + if ((uMsg == WM_MSIME_RECONVERTOPTIONS) || + (uMsg == WM_MSIME_SERVICE) || + (uMsg == WM_MSIME_MOUSE) || + (uMsg == WM_MSIME_RECONVERTREQUEST) || + (uMsg == WM_MSIME_RECONVERT) || + (uMsg == WM_MSIME_QUERYPOSITION) || + (uMsg == WM_MSIME_DOCUMENTFEED)) + { + ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); + if (immHkl->UIWnd) + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; + } + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } +} 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 Feb 3 20:58:12 2013 @@ -71,7 +71,7 @@ reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.5.4 reactos/dll/win32/imagehlp # Synced to Wine-1.5.4 -reactos/dll/win32/imm32 # Synced to Wine-1.5.4 +reactos/dll/win32/imm32 # Synced to Wine-1.5.19 reactos/dll/win32/inetcomm # Synced to Wine-1.5.4 reactos/dll/win32/inetmib1 # Synced to Wine-1.5.4 reactos/dll/win32/initpki # Synced to Wine-1.5.19

1 0

[akhaldi] 58283: [USP10_WINETEST] * Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 03 Feb '13

03 Feb '13

Author: akhaldi Date: Sun Feb 3 20:49:58 2013 New Revision: 58283 URL: http://svn.reactos.org/svn/reactos?rev=58283&view=rev Log: [USP10_WINETEST] * Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Sun Feb 3 20:49:58 2013 @@ -1804,11 +1804,64 @@ ok (!psc, "psc is not null after ScriptFreeCache\n"); } +#define MAX_ENUM_FONTS 4096 + +struct enum_font_data +{ + int total; + ENUMLOGFONT elf[MAX_ENUM_FONTS]; +}; + +static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE)) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + +static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (!(type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE))) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + static void test_ScriptGetFontProperties(HDC hdc) { HRESULT hr; SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; + HFONT font, oldfont; + LOGFONT lf; + struct enum_font_data efnd; + TEXTMETRICA tmA; + WORD gi[3]; + WCHAR str[3]; + DWORD i, ret; + WORD system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); + static const WCHAR invalids[] = {0x0020, 0x200B, 0xF71B}; + /* U+0020: numeric space + U+200B: zero width space + U+F71B: unkown, found by black box testing */ + BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ @@ -1866,6 +1919,109 @@ ok( psc == old_psc, "Expected psc not to be changed, was %p is now %p\n", old_psc, psc); ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + pGetGlyphIndicesW = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetGlyphIndicesW"); + if (!pGetGlyphIndicesW) + { + win_skip("Skip on WINNT4\n"); + return; + } + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_bitmap_font_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("bitmap font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + ret = GetTextMetricsA(hdc, &tmA); + ok(ret != 0, "GetTextMetricsA failed!\n"); + + is_terminal = !(lstrcmpA(lf.lfFaceName, "Terminal") && lstrcmpA(lf.lfFaceName, "@Terminal")); + ok(sfp.wgBlank == tmA.tmBreakChar || broken(is_terminal) || broken(is_arabic), "bitmap font %s wgBlank %04x tmBreakChar %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar); + + ok(sfp.wgDefault == tmA.tmDefaultChar || broken(is_arabic), "bitmap font %s wgDefault %04x, tmDefaultChar %04x\n", lf.lfFaceName, sfp.wgDefault, tmA.tmDefaultChar); + + ok(sfp.wgInvalid == sfp.wgBlank || broken(is_arabic), "bitmap font %s wgInvalid %02x wgBlank %02x\n", lf.lfFaceName, sfp.wgInvalid, sfp.wgBlank); + + ok(sfp.wgKashida == 0xFFFF || broken(is_arabic), "bitmap font %s wgKashida %02x\n", lf.lfFaceName, sfp.wgKashida); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } + + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_truetype_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("truetype font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + str[0] = 0x0020; /* U+0020: numeric space */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + ok(sfp.wgBlank == gi[0], "truetype font %s wgBlank %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgBlank, gi[0]); + + ok(sfp.wgDefault == 0 || broken(is_arabic), "truetype font %s wgDefault %04x\n", lf.lfFaceName, sfp.wgDefault); + + ret = pGetGlyphIndicesW(hdc, invalids, 3, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + if (gi[2] != 0xFFFF) /* index of default non exist char */ + ok(sfp.wgInvalid == gi[2], "truetype font %s wgInvalid %04x gi[2] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[2]); + else if (gi[1] != 0xFFFF) + ok(sfp.wgInvalid == gi[1], "truetype font %s wgInvalid %04x gi[1] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[1]); + else if (gi[0] != 0xFFFF) + ok(sfp.wgInvalid == gi[0], "truetype font %s wgInvalid %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[0]); + else + ok(sfp.wgInvalid == 0, "truetype font %s wgInvalid %04x expect 0\n", lf.lfFaceName, sfp.wgInvalid); + + str[0] = 0x0640; /* U+0640: kashida */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + is_arial = !lstrcmpA(lf.lfFaceName, "Arial"); + is_times_new_roman= !lstrcmpA(lf.lfFaceName, "Times New Roman"); + ok(sfp.wgKashida == gi[0] || broken(is_arial || is_times_new_roman) || broken(is_arabic), "truetype font %s wgKashida %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgKashida, gi[0]); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } } static void test_ScriptTextOut(HDC hdc) @@ -2433,7 +2589,7 @@ else ok(lead < trail, "Trailing values should be after leading for ltr characters(%i)\n",Cp); - /* move by 1 pixel so that we are not inbetween 2 characters. That could result in being the lead of a rtl and + /* move by 1 pixel so that we are not between 2 characters. That could result in being the lead of a rtl and at the same time the trail of an ltr */ /* inside the leading edge */

1 0

[akhaldi] 58282: [USP10] * Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 03 Feb '13

03 Feb '13

Author: akhaldi Date: Sun Feb 3 20:49:47 2013 New Revision: 58282 URL: http://svn.reactos.org/svn/reactos?rev=58282&view=rev Log: [USP10] * Sync with Wine 1.5.19. Modified: trunk/reactos/dll/win32/usp10/indic.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10_internal.h 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/usp10/indic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indic.c?re… Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[tfaber] 58281: [NTOSKRNL:OB] - Actually fail when the maximum number of reparse attempts is reached in ObpLookupObjectName. It previously returned a pointer to whatever object was currently in cha...
by tfaber＠svn.reactos.org 03 Feb '13

03 Feb '13

Author: tfaber Date: Sun Feb 3 20:15:54 2013 New Revision: 58281 URL: http://svn.reactos.org/svn/reactos?rev=58281&view=rev Log: [NTOSKRNL:OB] - Actually fail when the maximum number of reparse attempts is reached in ObpLookupObjectName. It previously returned a pointer to whatever object was currently in charge of parsing, but without taking a reference to it. - Fixes 'Header->HandleCount == 0' assertion failure (on \REGISTRY object) after running ntdll_winetest:reg three times (and also fixes the remaining test failure) Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Sun Feb 3 20:15:54 2013 @@ -437,7 +437,7 @@ } else if (!(ObjectName->Length) || !(ObjectName->Buffer)) { - /* Just return the Root Directory if we didn't get a name*/ + /* Just return the Root Directory if we didn't get a name */ Status = ObReferenceObjectByPointer(RootDirectory, 0, ObjectType, @@ -719,7 +719,7 @@ if (ObjectNameInfo->Name.Buffer) { /* Free it */ - ExFreePoolWithTag(ObjectNameInfo->Name.Buffer, OB_NAME_TAG ); + ExFreePoolWithTag(ObjectNameInfo->Name.Buffer, OB_NAME_TAG); } /* Write new one */ @@ -796,6 +796,11 @@ /* Reparse again */ Reparse = TRUE; --MaxReparse; + if (MaxReparse == 0) + { + Object = NULL; + break; + } /* Start over from root if we got sent back there */ if ((Status == STATUS_REPARSE_OBJECT) ||

1 0

[jjones] 58280: this is a test of of this here thing.
by jjones＠svn.reactos.org 03 Feb '13

03 Feb '13

Author: jjones Date: Sun Feb 3 19:44:52 2013 New Revision: 58280 URL: http://svn.reactos.org/svn/reactos?rev=58280&view=rev Log: this is a test of of this here thing. Modified: branches/vs_jc/README Modified: branches/vs_jc/README URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/README?rev=58280&r1=58279… ============================================================================== --- branches/vs_jc/README [iso-8859-1] (original) +++ branches/vs_jc/README [iso-8859-1] Sun Feb 3 19:44:52 2013 @@ -27,3 +27,6 @@ 4. Who is responsible See the CREDITS file. + + +Hey, JC is just added some text to this file!!!

1 0

[akhaldi] 58279: [EXPLORER_NEW] * Add transparency to icons in the task bar and in the tray bar. Brought to you by Carlo Bramini. CORE-6938 #resolve #comment Committed in r58279. Grazie ; )
by akhaldi＠svn.reactos.org 03 Feb '13

03 Feb '13

Author: akhaldi Date: Sun Feb 3 11:11:21 2013 New Revision: 58279 URL: http://svn.reactos.org/svn/reactos?rev=58279&view=rev Log: [EXPLORER_NEW] * Add transparency to icons in the task bar and in the tray bar. Brought to you by Carlo Bramini. CORE-6938 #resolve #comment Committed in r58279. Grazie ;) Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/trayntfy.c Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Sun Feb 3 11:11:21 2013 @@ -1462,7 +1462,7 @@ sizeof(TBBUTTON), 0); - This->TaskIcons = ImageList_Create(16, 16, ILC_COLOR32, 0, 1000); + This->TaskIcons = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 1000); SendMessage(This->hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)This->TaskIcons); /* Calculate the default button size. Don't save this in This->ButtonSize.cx so that Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sun Feb 3 11:11:21 2013 @@ -380,7 +380,7 @@ sizeof(TBBUTTON), 0); - This->SysIcons = ImageList_Create(16, 16, ILC_COLOR32, 0, 1000); + This->SysIcons = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 1000); SendMessage(This->hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)This->SysIcons); BtnSize.cx = BtnSize.cy = 18;

1 0

[ekohl] 58278: [SAMSRV] Add new passwords to the password history and move the whole password setting code into a separate function.
by ekohl＠svn.reactos.org 03 Feb '13

03 Feb '13

Author: ekohl Date: Sun Feb 3 00:13:53 2013 New Revision: 58278 URL: http://svn.reactos.org/svn/reactos?rev=58278&view=rev Log: [SAMSRV] Add new passwords to the password history and move the whole password setting code into a separate function. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/user.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Feb 3 00:13:53 2013 @@ -6533,51 +6533,16 @@ ULONG Length = 0; NTSTATUS Status = STATUS_SUCCESS; - if (Buffer->Internal1.NtPasswordPresent) - { - /* FIXME: Decrypt NT password */ - - Status = SampSetObjectAttribute(UserObject, - L"NTPwd", - REG_BINARY, - &Buffer->Internal1.EncryptedNtOwfPassword, - sizeof(ENCRYPTED_NT_OWF_PASSWORD)); - if (!NT_SUCCESS(Status)) - goto done; - } - else - { - Status = SampSetObjectAttribute(UserObject, - L"NTPwd", - REG_BINARY, - NULL, - 0); - if (!NT_SUCCESS(Status)) - goto done; - } - - if (Buffer->Internal1.LmPasswordPresent) - { - /* FIXME: Decrypt LM password */ - - Status = SampSetObjectAttribute(UserObject, - L"LMPwd", - REG_BINARY, - &Buffer->Internal1.EncryptedLmOwfPassword, - sizeof(ENCRYPTED_LM_OWF_PASSWORD)); - if (!NT_SUCCESS(Status)) - goto done; - } - else - { - Status = SampSetObjectAttribute(UserObject, - L"LMPwd", - REG_BINARY, - NULL, - 0); - if (!NT_SUCCESS(Status)) - goto done; - } + /* FIXME: Decrypt NT password */ + /* FIXME: Decrypt LM password */ + + Status = SampSetUserPassword(UserObject, + &Buffer->Internal1.EncryptedNtOwfPassword, + Buffer->Internal1.NtPasswordPresent, + &Buffer->Internal1.EncryptedLmOwfPassword, + Buffer->Internal1.LmPasswordPresent); + if (!NT_SUCCESS(Status)) + goto done; /* Get the fixed user attributes */ Length = sizeof(SAM_USER_FIXED_DATA); Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Feb 3 00:13:53 2013 @@ -297,4 +297,11 @@ IN ULONG GroupId, IN ULONG GroupAttributes); +NTSTATUS +SampSetUserPassword(IN PSAM_DB_OBJECT UserObject, + IN PENCRYPTED_NT_OWF_PASSWORD NtPassword, + IN BOOLEAN NtPasswordPresent, + IN PENCRYPTED_LM_OWF_PASSWORD LmPassword, + IN BOOLEAN LmPasswordPresent); + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re… ============================================================================== --- trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] Sun Feb 3 00:13:53 2013 @@ -319,4 +319,203 @@ return Status; } + +NTSTATUS +SampSetUserPassword(IN PSAM_DB_OBJECT UserObject, + IN PENCRYPTED_NT_OWF_PASSWORD NtPassword, + IN BOOLEAN NtPasswordPresent, + IN PENCRYPTED_LM_OWF_PASSWORD LmPassword, + IN BOOLEAN LmPasswordPresent) +{ + PENCRYPTED_NT_OWF_PASSWORD NtHistory = NULL; + PENCRYPTED_LM_OWF_PASSWORD LmHistory = NULL; + ULONG NtHistoryLength = 0; + ULONG LmHistoryLength = 0; + ULONG CurrentHistoryLength; + ULONG MaxHistoryLength = 3; + ULONG Length = 0; + NTSTATUS Status; + + /* Get the size of the NT history */ + SampGetObjectAttribute(UserObject, + L"NTPwdHistory", + NULL, + NULL, + &Length); + + CurrentHistoryLength = Length / sizeof(ENCRYPTED_NT_OWF_PASSWORD); + if (CurrentHistoryLength < MaxHistoryLength) + { + NtHistoryLength = (CurrentHistoryLength + 1) * sizeof(ENCRYPTED_NT_OWF_PASSWORD); + } + else + { + NtHistoryLength = MaxHistoryLength * sizeof(ENCRYPTED_NT_OWF_PASSWORD); + } + + /* Allocate the history buffer */ + NtHistory = midl_user_allocate(NtHistoryLength); + if (NtHistory == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + if (Length > 0) + { + /* Get the history */ + Status = SampGetObjectAttribute(UserObject, + L"NTPwdHistory", + NULL, + NtHistory, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + } + + /* Get the size of the LM history */ + Length = 0; + SampGetObjectAttribute(UserObject, + L"LMPwdHistory", + NULL, + NULL, + &Length); + + CurrentHistoryLength = Length / sizeof(ENCRYPTED_LM_OWF_PASSWORD); + if (CurrentHistoryLength < MaxHistoryLength) + { + LmHistoryLength = (CurrentHistoryLength + 1) * sizeof(ENCRYPTED_LM_OWF_PASSWORD); + } + else + { + LmHistoryLength = MaxHistoryLength * sizeof(ENCRYPTED_LM_OWF_PASSWORD); + } + + /* Allocate the history buffer */ + LmHistory = midl_user_allocate(LmHistoryLength); + if (LmHistory == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + if (Length > 0) + { + /* Get the history */ + Status = SampGetObjectAttribute(UserObject, + L"LMPwdHistory", + NULL, + LmHistory, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + } + + /* Set the new password */ + if (NtPasswordPresent) + { + Status = SampSetObjectAttribute(UserObject, + L"NTPwd", + REG_BINARY, + (PVOID)NtPassword, + sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + if (!NT_SUCCESS(Status)) + goto done; + } + else + { + Status = SampSetObjectAttribute(UserObject, + L"NTPwd", + REG_BINARY, + NULL, + 0); + if (!NT_SUCCESS(Status)) + goto done; + } + + if (LmPasswordPresent) + { + Status = SampSetObjectAttribute(UserObject, + L"LMPwd", + REG_BINARY, + (PVOID)LmPassword, + sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + if (!NT_SUCCESS(Status)) + goto done; + } + else + { + Status = SampSetObjectAttribute(UserObject, + L"LMPwd", + REG_BINARY, + NULL, + 0); + if (!NT_SUCCESS(Status)) + goto done; + } + + /* Move the old passwords down by one entry */ + if (NtHistoryLength > sizeof(ENCRYPTED_NT_OWF_PASSWORD)) + { + MoveMemory(&(NtHistory[1]), + &(NtHistory[0]), + NtHistoryLength - sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + } + + /* Add the new password on top of the history */ + if (NtPasswordPresent) + { + CopyMemory(&(NtHistory[0]), + NtPassword, + sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + } + else + { + ZeroMemory(&(NtHistory[0]), + sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + } + + /* Set the history */ + Status = SampSetObjectAttribute(UserObject, + L"NTPwdHistory", + REG_BINARY, + (PVOID)NtHistory, + NtHistoryLength); + if (!NT_SUCCESS(Status)) + goto done; + + /* Move the old passwords down by one entry */ + if (LmHistoryLength > sizeof(ENCRYPTED_LM_OWF_PASSWORD)) + { + MoveMemory(&(LmHistory[1]), + &(LmHistory[0]), + LmHistoryLength - sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + } + + /* Add the new password on top of the history */ + if (LmPasswordPresent) + { + CopyMemory(&(LmHistory[0]), + LmPassword, + sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + } + else + { + ZeroMemory(&(LmHistory[0]), + sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + } + + /* Set the LM password history */ + Status = SampSetObjectAttribute(UserObject, + L"LMPwdHistory", + REG_BINARY, + (PVOID)LmHistory, + LmHistoryLength); + if (!NT_SUCCESS(Status)) + goto done; + +done: + if (NtHistory != NULL) + midl_user_free(NtHistory); + + if (LmHistory != NULL) + midl_user_free(LmHistory); + + return Status; +} + /* EOF */

1 0

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