Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 72282: [IMM32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:08:05 2016 New Revision: 72282 URL: http://svn.reactos.org/svn/reactos?rev=72282&view=rev Log: [IMM32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 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] Thu Aug 18 10:08:05 2016 @@ -44,7 +44,7 @@ HWND hwnd; HHOOK get_msg_hook; HHOOK call_wnd_proc_hook; - imm_msgs msgs[32]; + imm_msgs msgs[64]; unsigned int i_msg; } msg_spy; @@ -58,6 +58,12 @@ HARDWAREINPUT hi; } u; } TEST_INPUT; + +typedef struct _tagTRANSMSG { + UINT message; + WPARAM wParam; + LPARAM lParam; +} TRANSMSG, *LPTRANSMSG; static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); @@ -166,19 +172,72 @@ * messages being sent to this window in response. */ static const char wndcls[] = "winetest_imm32_wndcls"; +static enum { PHASE_UNKNOWN, FIRST_WINDOW, SECOND_WINDOW, + CREATE_CANCEL, NCCREATE_CANCEL, IME_DISABLED } test_phase; static HWND hwnd; +static HWND get_ime_window(void); + static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + HWND default_ime_wnd; switch (msg) { case WM_IME_SETCONTEXT: + return TRUE; case WM_NCCREATE: + default_ime_wnd = get_ime_window(); + switch(test_phase) { + case FIRST_WINDOW: + case IME_DISABLED: + ok(!default_ime_wnd, "expected no IME windows\n"); + break; + case SECOND_WINDOW: + ok(default_ime_wnd != NULL, "expected IME window existence\n"); + break; + default: + break; /* do nothing */ + } + if (test_phase == NCCREATE_CANCEL) + return FALSE; + return TRUE; + case WM_NCCALCSIZE: + default_ime_wnd = get_ime_window(); + switch(test_phase) { + case FIRST_WINDOW: + case SECOND_WINDOW: + case CREATE_CANCEL: + todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) + ok(default_ime_wnd != NULL, "expected IME window existence\n"); + break; + case IME_DISABLED: + ok(!default_ime_wnd, "expected no IME windows\n"); + break; + default: + break; /* do nothing */ + } + break; case WM_CREATE: + default_ime_wnd = get_ime_window(); + switch(test_phase) { + case FIRST_WINDOW: + case SECOND_WINDOW: + case CREATE_CANCEL: + todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) + ok(default_ime_wnd != NULL, "expected IME window existence\n"); + break; + case IME_DISABLED: + ok(!default_ime_wnd, "expected no IME windows\n"); + break; + default: + break; /* do nothing */ + } + if (test_phase == CREATE_CANCEL) + return -1; return TRUE; } - return DefWindowProcA(hwnd,msg,wParam,lParam); + return DefWindowProcA(hWnd,msg,wParam,lParam); } static BOOL init(void) { @@ -633,8 +692,11 @@ ImmReleaseContext(threadinfo.hwnd,otherHimc); ImmReleaseContext(hwnd,himc); - DestroyWindow(threadinfo.hwnd); - TerminateThread(hThread, 1); + SendMessageA(threadinfo.hwnd, WM_CLOSE, 0, 0); + rc = PostThreadMessageA(dwThreadId, WM_QUIT, 1, 0); + ok(rc == 1, "PostThreadMessage should succeed\n"); + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); himc = ImmGetContext(GetDesktopWindow()); ok(himc == NULL, "Should not be able to get himc from other process window\n"); @@ -836,11 +898,175 @@ WaitForSingleObject(thread, INFINITE); ok(thread_ime_wnd != def1, "thread_ime_wnd == def1\n"); ok(!IsWindow(thread_ime_wnd), "thread_ime_wnd was not destroyed\n"); + CloseHandle(thread); ImmReleaseContext(hwnd, imc1); ImmReleaseContext(hwnd, imc3); ImmDestroyContext(imc2); DestroyWindow(hwnd); +} + +static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) +{ + static const WCHAR imeW[] = {'I','M','E',0}; + WCHAR class_nameW[16]; + HWND *ime_window = (HWND *)param; + if (GetClassNameW(hWnd, class_nameW, sizeof(class_nameW)/sizeof(class_nameW[0])) && + !lstrcmpW(class_nameW, imeW)) { + *ime_window = hWnd; + return FALSE; + } + return TRUE; +} + +static HWND get_ime_window(void) +{ + HWND ime_window = NULL; + EnumThreadWindows(GetCurrentThreadId(), is_ime_window_proc, (LPARAM)&ime_window); + return ime_window; +} + +struct testcase_ime_window { + BOOL visible; + BOOL top_level_window; +}; + +static DWORD WINAPI test_default_ime_window_cb(void *arg) +{ + struct testcase_ime_window *testcase = (struct testcase_ime_window *)arg; + DWORD visible = testcase->visible ? WS_VISIBLE : 0; + HWND hwnd1, hwnd2, default_ime_wnd, ime_wnd; + + ok(!get_ime_window(), "Expected no IME windows\n"); + if (testcase->top_level_window) { + test_phase = FIRST_WINDOW; + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + } + else { + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_CHILD | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 24, hwnd, NULL, GetModuleHandleW(NULL), NULL); + } + ime_wnd = get_ime_window(); + todo_wine ok(ime_wnd != NULL, "Expected IME window existence\n"); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); + todo_wine ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); + + test_phase = SECOND_WINDOW; + hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + DestroyWindow(hwnd2); + todo_wine ok(IsWindow(ime_wnd) || + broken(!testcase->visible /* Vista */) || + broken(!testcase->top_level_window /* Vista */) , + "Expected IME window existence\n"); + DestroyWindow(hwnd1); + ok(!IsWindow(ime_wnd), "Expected no IME windows\n"); + return 1; +} + +static DWORD WINAPI test_default_ime_window_cancel_cb(void *arg) +{ + struct testcase_ime_window *testcase = (struct testcase_ime_window *)arg; + DWORD visible = testcase->visible ? WS_VISIBLE : 0; + HWND hwnd1, hwnd2, default_ime_wnd, ime_wnd; + + ok(!get_ime_window(), "Expected no IME windows\n"); + test_phase = NCCREATE_CANCEL; + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ok(hwnd1 == NULL, "creation succeeded, got %p\n", hwnd1); + ok(!get_ime_window(), "Expected no IME windows\n"); + + test_phase = CREATE_CANCEL; + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ok(hwnd1 == NULL, "creation succeeded, got %p\n", hwnd1); + ok(!get_ime_window(), "Expected no IME windows\n"); + + test_phase = FIRST_WINDOW; + hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ime_wnd = get_ime_window(); + todo_wine ok(ime_wnd != NULL, "Expected IME window existence\n"); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd2); + todo_wine ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); + + DestroyWindow(hwnd2); + ok(!IsWindow(ime_wnd), "Expected no IME windows\n"); + return 1; +} + +static DWORD WINAPI test_default_ime_disabled_cb(void *arg) +{ + HWND hWnd, default_ime_wnd; + + ok(!get_ime_window(), "Expected no IME windows\n"); + ImmDisableIME(GetCurrentThreadId()); + test_phase = IME_DISABLED; + hWnd = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + default_ime_wnd = ImmGetDefaultIMEWnd(hWnd); + ok(!default_ime_wnd, "Expected no IME windows\n"); + DestroyWindow(hWnd); + return 1; +} + +static void test_default_ime_window_creation(void) +{ + HANDLE thread; + size_t i; + struct testcase_ime_window testcases[] = { + /* visible, top-level window */ + { TRUE, TRUE }, + { FALSE, TRUE }, + { TRUE, FALSE }, + { FALSE, FALSE } + }; + + for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + { + thread = CreateThread(NULL, 0, test_default_ime_window_cb, &testcases[i], 0, NULL); + ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError()); + while (MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + } + CloseHandle(thread); + + if (testcases[i].top_level_window) + { + thread = CreateThread(NULL, 0, test_default_ime_window_cancel_cb, &testcases[i], 0, NULL); + ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + } + } + + thread = CreateThread(NULL, 0, test_default_ime_disabled_cb, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + test_phase = PHASE_UNKNOWN; } static void test_ImmGetIMCLockCount(void) @@ -1015,6 +1241,9 @@ HIMC imc; UINT idx = 0; + LPINPUTCONTEXT lpIMC; + LPTRANSMSG lpTransMsg; + HWND hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleA(NULL), NULL); @@ -1032,6 +1261,64 @@ if (msg) ok(!msg->post, "Message should not be posted\n"); } while (msg); msg_spy_flush_msgs(); + + lpIMC = ImmLockIMC(imc); + lpIMC->hMsgBuf = ImmReSizeIMCC(lpIMC->hMsgBuf, (lpIMC->dwNumMsgBuf + 1) * sizeof(TRANSMSG)); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg += lpIMC->dwNumMsgBuf; + lpTransMsg->message = WM_IME_STARTCOMPOSITION; + lpTransMsg->wParam = 0; + lpTransMsg->lParam = 0; + ImmUnlockIMCC(lpIMC->hMsgBuf); + lpIMC->dwNumMsgBuf++; + ImmUnlockIMC(imc); + ImmGenerateMessage(imc); + idx = 0; + do + { + msg = msg_spy_find_next_msg(WM_IME_STARTCOMPOSITION, &idx); + if (msg) ok(!msg->post, "Message should not be posted\n"); + } while (msg); + msg_spy_flush_msgs(); + + lpIMC = ImmLockIMC(imc); + lpIMC->hMsgBuf = ImmReSizeIMCC(lpIMC->hMsgBuf, (lpIMC->dwNumMsgBuf + 1) * sizeof(TRANSMSG)); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg += lpIMC->dwNumMsgBuf; + lpTransMsg->message = WM_IME_COMPOSITION; + lpTransMsg->wParam = 0; + lpTransMsg->lParam = 0; + ImmUnlockIMCC(lpIMC->hMsgBuf); + lpIMC->dwNumMsgBuf++; + ImmUnlockIMC(imc); + ImmGenerateMessage(imc); + idx = 0; + do + { + msg = msg_spy_find_next_msg(WM_IME_COMPOSITION, &idx); + if (msg) ok(!msg->post, "Message should not be posted\n"); + } while (msg); + msg_spy_flush_msgs(); + + lpIMC = ImmLockIMC(imc); + lpIMC->hMsgBuf = ImmReSizeIMCC(lpIMC->hMsgBuf, (lpIMC->dwNumMsgBuf + 1) * sizeof(TRANSMSG)); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg += lpIMC->dwNumMsgBuf; + lpTransMsg->message = WM_IME_ENDCOMPOSITION; + lpTransMsg->wParam = 0; + lpTransMsg->lParam = 0; + ImmUnlockIMCC(lpIMC->hMsgBuf); + lpIMC->dwNumMsgBuf++; + ImmUnlockIMC(imc); + ImmGenerateMessage(imc); + idx = 0; + do + { + msg = msg_spy_find_next_msg(WM_IME_ENDCOMPOSITION, &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); @@ -1523,6 +1810,7 @@ test_ImmGetContext(); test_ImmGetDescription(); test_ImmDefaultHwnd(); + test_default_ime_window_creation(); test_ImmGetIMCLockCount(); test_ImmGetIMCCLockCount(); test_ImmDestroyContext();

1 0

[akhaldi] 72281: [HLINK_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:07:20 2016 New Revision: 72281 URL: http://svn.reactos.org/svn/reactos?rev=72281&view=rev Log: [HLINK_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/hlink/hlink.c Modified: trunk/rostests/winetests/hlink/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/hlink.c?r… ============================================================================== --- trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] Thu Aug 18 10:07:20 2016 @@ -637,7 +637,7 @@ ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); - ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(!lstrcmpW(name, winehq_urlW), "wrong display name %s\n", wine_dbgstr_w(name)); CoTaskMemFree(name); @@ -664,7 +664,7 @@ ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); - ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(!lstrcmpW(name, invalid_urlW), "wrong display name %s\n", wine_dbgstr_w(name)); CoTaskMemFree(name); @@ -680,7 +680,7 @@ ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); - ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(!lstrcmpW(name, file_urlW+8), "wrong display name %s\n", wine_dbgstr_w(name)); CoTaskMemFree(name); @@ -1731,7 +1731,7 @@ static HRESULT WINAPI hls_test_Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *toLeft, REFIID riid, void **obj) { - ok(0, "BTS: %p %p %p %p %p\n", iface, pbc, toLeft, riid, obj); + ok(0, "BTS: %p %p %p %s %p\n", iface, pbc, toLeft, wine_dbgstr_guid(riid), obj); return E_NOTIMPL; }

1 0

[akhaldi] 72280: [HLINK] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:06:29 2016 New Revision: 72280 URL: http://svn.reactos.org/svn/reactos?rev=72280&view=rev Log: [HLINK] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/hlink/browse_ctx.c trunk/reactos/dll/win32/hlink/hlink_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hlink/browse_ctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/browse_ctx… ============================================================================== --- trunk/reactos/dll/win32/hlink/browse_ctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/browse_ctx.c [iso-8859-1] Thu Aug 18 10:06:29 2016 @@ -103,10 +103,13 @@ IMoniker *mon; IMoniker *composite; IRunningObjectTable *ROT; + HRESULT hr; FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); - CreateItemMoniker(NULL, szIdent, &mon); + hr = CreateItemMoniker(NULL, szIdent, &mon); + if (FAILED(hr)) + return hr; CreateGenericComposite(mon, pimk, &composite); GetRunningObjectTable(0, &ROT); Modified: trunk/reactos/dll/win32/hlink/hlink_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] Thu Aug 18 10:06:29 2016 @@ -221,8 +221,8 @@ IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter, REFIID riid, void **ppvObj) { - FIXME("%p %p %d %p %p %p\n", - piDataObj, pihlsite, dwSiteData, piunkOuter, riid, ppvObj); + FIXME("%p, %p, %d, %p, %s, %p\n", piDataObj, pihlsite, dwSiteData, + piunkOuter, debugstr_guid(riid), ppvObj); *ppvObj = NULL; return E_NOTIMPL; } 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] Thu Aug 18 10:06:29 2016 @@ -70,7 +70,7 @@ reactos/dll/win32/fusion # Synced to WineStaging-1.9.11 reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.11 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.9.16 -reactos/dll/win32/hlink # Synced to WineStaging-1.9.11 +reactos/dll/win32/hlink # Synced to WineStaging-1.9.16 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.11 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/iccvid # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72279: [HHCTRL.OCX] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:05:18 2016 New Revision: 72279 URL: http://svn.reactos.org/svn/reactos?rev=72279&view=rev Log: [HHCTRL.OCX] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] Thu Aug 18 10:05:18 2016 @@ -405,10 +405,7 @@ GetClientRect(info->WinType.hwndToolBar, &rectTB); GetClientRect(info->WinType.hwndNavigation, &rectNP); - rc->left = rectNP.right; - rc->top = rectTB.bottom; - rc->bottom = rectWND.bottom - rectTB.bottom; - rc->right = SIZEBAR_WIDTH; + SetRect(rc, rectNP.right, rectTB.bottom, SIZEBAR_WIDTH, rectWND.bottom - rectTB.bottom); } static BOOL HH_AddSizeBar(HHInfo *pHHInfo) 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] Thu Aug 18 10:05:18 2016 @@ -69,7 +69,7 @@ reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 reactos/dll/win32/fusion # Synced to WineStaging-1.9.11 reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.11 -reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.9.11 +reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.9.16 reactos/dll/win32/hlink # Synced to WineStaging-1.9.11 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.11 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72278: [DBGHELP] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:04:21 2016 New Revision: 72278 URL: http://svn.reactos.org/svn/reactos?rev=72278&view=rev Log: [DBGHELP] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] Thu Aug 18 10:04:21 2016 @@ -430,6 +430,7 @@ switch (abbrev_attr->form) { + case DW_FORM_flag_present: step = 0; break; case DW_FORM_ref_addr: case DW_FORM_addr: step = ctx->word_size; break; case DW_FORM_flag: @@ -475,6 +476,11 @@ case DW_FORM_flag: attr->u.uvalue = dwarf2_get_byte(data); TRACE("flag<0x%lx>\n", attr->u.uvalue); + break; + + case DW_FORM_flag_present: + attr->u.uvalue = 1; + TRACE("flag_present\n"); break; case DW_FORM_data1: 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] Thu Aug 18 10:04:21 2016 @@ -63,7 +63,7 @@ reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptui # Synced to WineStaging-1.9.16 -reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.11 +reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.16 reactos/dll/win32/dciman32 # Synced to WineStaging-1.9.11 reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13

1 0

[akhaldi] 72277: [CRYPTUI] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:03:16 2016 New Revision: 72277 URL: http://svn.reactos.org/svn/reactos?rev=72277&view=rev Log: [CRYPTUI] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/cryptui/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Thu Aug 18 10:03:16 2016 @@ -1796,16 +1796,16 @@ static void add_icon_to_control(HWND hwnd, int id) { HRESULT hr; - LPRICHEDITOLE richEditOle = NULL; - LPOLEOBJECT object = NULL; + IRichEditOle *richEditOle = NULL; + IOleObject *object = NULL; CLSID clsid; LPOLECACHE oleCache = NULL; FORMATETC formatEtc; DWORD conn; - LPDATAOBJECT dataObject = NULL; + IDataObject *dataObject = NULL; HBITMAP bitmap = NULL; STGMEDIUM stgm; - LPOLECLIENTSITE clientSite = NULL; + IOleClientSite *clientSite = NULL; REOBJECT reObject; TRACE("(%p, %d)\n", hwnd, id); 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] Thu Aug 18 10:03:16 2016 @@ -62,7 +62,7 @@ reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11 -reactos/dll/win32/cryptui # Synced to WineStaging-1.9.11 +reactos/dll/win32/cryptui # Synced to WineStaging-1.9.16 reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.11 reactos/dll/win32/dciman32 # Synced to WineStaging-1.9.11 reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72276: [CRYPT32] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:01:42 2016 New Revision: 72276 URL: http://svn.reactos.org/svn/reactos?rev=72276&view=rev Log: [CRYPT32] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c trunk/reactos/dll/win32/crypt32/proplist.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/collecti… ============================================================================== --- trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] Thu Aug 18 10:01:42 2016 @@ -110,10 +110,10 @@ } else { - WINE_STORE_LIST_ENTRY *entry, *next; + WINE_STORE_LIST_ENTRY *entry; EnterCriticalSection(&store->cs); - LIST_FOR_EACH_ENTRY_SAFE(entry, next, &store->stores, WINE_STORE_LIST_ENTRY, entry) + LIST_FOR_EACH_ENTRY(entry, &store->stores, WINE_STORE_LIST_ENTRY, entry) { if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) { @@ -555,7 +555,7 @@ { WINE_COLLECTIONSTORE *collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; - WINE_STORE_LIST_ENTRY *store, *next; + WINE_STORE_LIST_ENTRY *store; TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore); @@ -574,8 +574,7 @@ return; } EnterCriticalSection(&collection->cs); - LIST_FOR_EACH_ENTRY_SAFE(store, next, &collection->stores, - WINE_STORE_LIST_ENTRY, entry) + LIST_FOR_EACH_ENTRY(store, &collection->stores, WINE_STORE_LIST_ENTRY, entry) { if (store->store == sibling) { Modified: trunk/reactos/dll/win32/crypt32/proplist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/proplist… ============================================================================== --- trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] Thu Aug 18 10:01:42 2016 @@ -142,11 +142,10 @@ void ContextPropertyList_RemoveProperty(CONTEXT_PROPERTY_LIST *list, DWORD id) { - CONTEXT_PROPERTY *prop, *next; + CONTEXT_PROPERTY *prop; EnterCriticalSection(&list->cs); - LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY, - entry) + LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry) { if (prop->propID == id) { 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] Thu Aug 18 10:01:42 2016 @@ -58,7 +58,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/compstui # Synced to WineStaging-1.9.11 reactos/dll/win32/credui # Synced to WineStaging-1.9.16 -reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.16 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72275: [CREDUI] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:00:07 2016 New Revision: 72275 URL: http://svn.reactos.org/svn/reactos?rev=72275&view=rev Log: [CREDUI] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/credui/credui.spec trunk/reactos/dll/win32/credui/credui_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/credui/credui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.sp… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui.spec [iso-8859-1] Thu Aug 18 10:00:07 2016 @@ -1,3 +1,4 @@ +@ stdcall CredPackAuthenticationBufferW(long wstr ptr ptr ptr) @ stub CredUICmdLinePromptForCredentialsA @ stub CredUICmdLinePromptForCredentialsW @ stub CredUIConfirmCredentialsA @@ -7,10 +8,12 @@ @ stdcall CredUIParseUserNameW(wstr ptr long ptr long) @ stub CredUIPromptForCredentialsA @ stdcall CredUIPromptForCredentialsW(ptr wstr ptr long ptr long ptr long ptr long) +@ stdcall CredUIPromptForWindowsCredentialsW(ptr long ptr ptr long ptr ptr ptr long) @ stdcall CredUIReadSSOCredA(str ptr) @ stdcall CredUIReadSSOCredW(wstr ptr) @ stdcall CredUIStoreSSOCredA(str str str long) @ stdcall CredUIStoreSSOCredW(wstr wstr wstr long) +@ stdcall CredUnPackAuthenticationBufferW(long ptr long ptr ptr ptr ptr ptr ptr) @ stub -private DllCanUnloadNow @ stub -private DllGetClassObject @ stub -private DllRegisterServer Modified: trunk/reactos/dll/win32/credui/credui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_ma… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_main.c [iso-8859-1] Thu Aug 18 10:00:07 2016 @@ -872,6 +872,7 @@ DWORD len_password = sizeof(password) / sizeof(password[0]); DWORD ret, flags; CREDUI_INFOW *cred_info = info; + SEC_WINNT_AUTH_IDENTITY_W *id = input_id; FIXME( "(%s, %p, %u, %s, %p, %p, %p, %x) stub\n", debugstr_w(target), info, error, debugstr_w(package), input_id, output_id, save, sspi_flags ); @@ -883,11 +884,6 @@ FIXME( "package %s not supported\n", debugstr_w(package) ); return ERROR_NO_SUCH_PACKAGE; } - if (input_id) - { - FIXME( "input identity not supported\n" ); - return ERROR_CALL_NOT_IMPLEMENTED; - } flags = CREDUI_FLAGS_ALWAYS_SHOW_UI | CREDUI_FLAGS_GENERIC_CREDENTIALS; @@ -897,12 +893,24 @@ if (!(sspi_flags & SSPIPFC_NO_CHECKBOX)) flags |= CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX; - find_existing_credential( target, username, len_username, password, len_password ); + if (!id) find_existing_credential( target, username, len_username, password, len_password ); + else + { + if (id->User && id->UserLength > 0 && id->UserLength <= CREDUI_MAX_USERNAME_LENGTH) + { + memcpy( username, id->User, id->UserLength * sizeof(WCHAR) ); + username[id->UserLength] = 0; + } + if (id->Password && id->PasswordLength > 0 && id->PasswordLength <= CREDUI_MAX_PASSWORD_LENGTH) + { + memcpy( password, id->Password, id->PasswordLength * sizeof(WCHAR) ); + password[id->PasswordLength] = 0; + } + } if (!(ret = CredUIPromptForCredentialsW( cred_info, target, NULL, error, username, len_username, password, len_password, save, flags ))) { - SEC_WINNT_AUTH_IDENTITY_W *id; DWORD size = sizeof(*id); WCHAR *ptr; @@ -930,3 +938,37 @@ return ret; } + +/****************************************************************************** + * CredUIPromptForWindowsCredentialsW [CREDUI.@] + */ +DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error, ULONG *package, + const void *in_buf, ULONG in_buf_size, void **out_buf, + ULONG *out_buf_size, BOOL *save, DWORD flags ) +{ + FIXME( "(%p, %u, %p, %p, %u, %p, %p, %p, %08x) stub\n", info, error, package, in_buf, in_buf_size, + out_buf, out_buf_size, save, flags ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * CredPackAuthenticationBufferW [CREDUI.@] + */ +BOOL WINAPI CredPackAuthenticationBufferW( DWORD flags, WCHAR *username, WCHAR *password, BYTE *buf, + DWORD *size ) +{ + FIXME( "(%08x, %s, %p, %p, %p) stub\n", flags, debugstr_w(username), password, buf, size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * CredUnPackAuthenticationBufferW [CREDUI.@] + */ +BOOL WINAPI CredUnPackAuthenticationBufferW( DWORD flags, void *buf, DWORD size, WCHAR *username, + DWORD *len_username, WCHAR *domain, DWORD *len_domain, + WCHAR *password, DWORD *len_password ) +{ + FIXME( "(%08x, %p, %u, %p, %p, %p, %p, %p, %p) stub\n", flags, buf, size, username, len_username, + domain, len_domain, password, len_password ); + return ERROR_CALL_NOT_IMPLEMENTED; +} 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] Thu Aug 18 10:00:07 2016 @@ -57,7 +57,7 @@ reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.11 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/compstui # Synced to WineStaging-1.9.11 -reactos/dll/win32/credui # Synced to WineStaging-1.9.11 +reactos/dll/win32/credui # Synced to WineStaging-1.9.16 reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72274: [CABINET] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 09:58:31 2016 New Revision: 72274 URL: http://svn.reactos.org/svn/reactos?rev=72274&view=rev Log: [CABINET] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fdi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] Thu Aug 18 09:58:31 2016 @@ -319,7 +319,7 @@ HFDI hfdi; char *str, *end, *path = NULL, *name = NULL; - TRACE("(%p, %s)\n", dest, szCabName); + TRACE("(%p, %s)\n", dest, debugstr_a(szCabName)); hfdi = FDICreate(mem_alloc, mem_free, Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Thu Aug 18 09:58:31 2016 @@ -2571,7 +2571,7 @@ * where all the cabinet files needed for decryption are simultaneously * available. But presumably, the API is supposed to support cabinets which * are split across multiple CDROMS; we may need to change our implementation - * to strictly serialize it's file usage so that it opens only one cabinet + * to strictly serialize its file usage so that it opens only one cabinet * at a time. Some experimentation with Windows is needed to figure out the * precise semantics required. The relevant code is here and in fdi_decomp(). */ @@ -2602,8 +2602,8 @@ * if we imagine parallelized access to the FDICopy API. * * The current implementation punts -- it just returns the previous cabinet and - * it's info from the header of this cabinet. This provides the right answer in - * 95% of the cases; its worth checking if Microsoft cuts the same corner before + * its info from the header of this cabinet. This provides the right answer in + * 95% of the cases; it's worth checking if Microsoft cuts the same corner before * we "fix" it. */ ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); 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] Thu Aug 18 09:58:31 2016 @@ -51,7 +51,7 @@ reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.16 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.4 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-1.9.11 +reactos/dll/win32/cabinet # Synced to WineStaging-1.9.16 reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72273: [AVIFIL32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 09:56:44 2016 New Revision: 72273 URL: http://svn.reactos.org/svn/reactos?rev=72273&view=rev Log: [AVIFIL32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/avifil32/api.c Modified: trunk/rostests/winetests/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/api.c?… ============================================================================== --- trunk/rostests/winetests/avifil32/api.c [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/api.c [iso-8859-1] Thu Aug 18 09:56:44 2016 @@ -709,6 +709,35 @@ while (IAVIFile_Release(avif)); } +static void test_COM_editstream(void) +{ + IAVIEditStream *edit; + IAVIStream *stream; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* Same refcount for all AVIEditStream interfaces */ + hr = CreateEditableStream(&stream, NULL); + ok(hr == S_OK, "AVIEditStream create failed: %08x, expected S_OK\n", hr); + refcount = IAVIStream_AddRef(stream); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IAVIStream_QueryInterface(stream, &IID_IAVIEditStream, (void**)&edit); + ok(hr == S_OK, "QueryInterface for IID_IAVIEditStream failed: %08x\n", hr); + refcount = IAVIEditStream_AddRef(edit); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IAVIEditStream_Release(edit); + + hr = IAVIEditStream_QueryInterface(edit, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IUnknown_Release(unk); + + while (IAVIEditStream_Release(edit)); +} + START_TEST(api) { @@ -721,6 +750,7 @@ test_ash1_corruption2(); test_COM(); test_COM_wavfile(); + test_COM_editstream(); AVIFileExit(); }

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