Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70111: [COMDLG32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: akhaldi Date: Wed Nov 25 14:26:11 2015 New Revision: 70111 URL: http://svn.reactos.org/svn/reactos?rev=70111&view=rev Log: [COMDLG32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/comdlg32/itemdlg.c trunk/rostests/winetests/comdlg32/printdlg.c Modified: trunk/rostests/winetests/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/itemdl… ============================================================================== --- trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] Wed Nov 25 14:26:11 2015 @@ -293,6 +293,9 @@ { IFileDialogEventsImpl *This = impl_from_IFileDialogEvents(iface); This->OnOverwrite++; + ok(*pResponse == FDEOR_DEFAULT, "overwrite response %u\n", *pResponse); + *pResponse = FDEOR_ACCEPT; + ok(!This->OnFileOk, "OnFileOk already called %u times\n", This->OnFileOk); return S_OK; } @@ -327,7 +330,7 @@ IFileSaveDialog *pfsd; IServiceProvider *psp; IOleWindow *pow; - IUnknown *punk; + IUnknown *punk, *unk2; HRESULT hr; LONG ref; @@ -336,7 +339,7 @@ &IID_IFileOpenDialog, (void**)&pfod); if(FAILED(hr)) { - skip("Could not instantiate the FileOpenDialog.\n"); + win_skip("Could not instantiate the FileOpenDialog.\n"); return FALSE; } ok(hr == S_OK, "got 0x%08x.\n", hr); @@ -347,11 +350,12 @@ hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&punk); ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); - - hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomizeAlt, (void**)&punk); - ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); + + hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomizeAlt, (void**)&unk2); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(punk == unk2, "got %p, %p\n", punk, unk2); + IUnknown_Release(punk); + IUnknown_Release(unk2); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileSaveDialog, (void**)&pfsd); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); @@ -453,11 +457,12 @@ hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogCustomize, (void**)&punk); ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); - - hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogCustomizeAlt, (void**)&punk); - ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); + + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogCustomizeAlt, (void**)&unk2); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(punk == unk2, "got %p, %p\n", punk, unk2); + IUnknown_Release(punk); + IUnknown_Release(unk2); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileOpenDialog, (void**)&pfod); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); @@ -778,22 +783,19 @@ IFileSaveDialog_AddPlace(pfsd, NULL, 0); } - todo_wine - { hr = IFileOpenDialog_AddPlace(pfod, psidesktop, FDAP_TOP + 1); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IFileOpenDialog_AddPlace(pfod, psidesktop, FDAP_BOTTOM); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_AddPlace(pfod, psidesktop, FDAP_TOP); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_AddPlace(pfsd, psidesktop, FDAP_TOP + 1); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IFileSaveDialog_AddPlace(pfsd, psidesktop, FDAP_BOTTOM); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_AddPlace(pfsd, psidesktop, FDAP_TOP); ok(hr == S_OK, "got 0x%08x\n", hr); - } /* SetFileName */ hr = IFileOpenDialog_SetFileName(pfod, NULL); @@ -1552,10 +1554,10 @@ GetClassNameW(item_parent, buf, 1024); ok(!lstrcmpW(buf, floatnotifysinkW), "Got %s\n", wine_dbgstr_w(buf)); item = find_window(dlg_hwnd, NULL, radiobutton1W); - todo_wine ok(item != NULL, "Failed to find item.\n"); + ok(item != NULL, "Failed to find item.\n"); item_parent = GetParent(item); GetClassNameW(item_parent, buf, 1024); - todo_wine ok(!lstrcmpW(buf, RadioButtonListW), "Got %s\n", wine_dbgstr_w(buf)); + ok(!lstrcmpW(buf, RadioButtonListW), "Got %s\n", wine_dbgstr_w(buf)); item_parent = GetParent(item_parent); GetClassNameW(item_parent, buf, 1024); ok(!lstrcmpW(buf, floatnotifysinkW), "Got %s\n", wine_dbgstr_w(buf)); @@ -1642,9 +1644,14 @@ ok(hr == S_OK, "got 0x%08x (control: %d).\n", hr, i); hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, i); - todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, ++i); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, i); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, i+1); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlState(pfdc, i, &cdstate); @@ -1652,32 +1659,32 @@ ok(cdstate == 0xdeadbeef, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, label); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, label); - todo_wine ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - todo_wine ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_SetControlItemState(pfdc, i, 0, 0); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - todo_wine ok(!cdstate, "got 0x%08x.\n", cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(!cdstate, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_SetControlItemState(pfdc, i, 0, CDCS_ENABLEDVISIBLE); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - todo_wine ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_SetControlLabel(pfdc, i, label2); - todo_wine ok(hr == E_NOTIMPL, "got 0x%08x (control: %d).\n", hr, i); + ok(hr == E_NOTIMPL, "got 0x%08x (control: %d).\n", hr, i); hr = IFileDialogCustomize_AddMenu(pfdc, i, menuW); - todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_AddMenu(pfdc, ++i, label); ok(hr == S_OK, "got 0x%08x.\n", hr); @@ -1729,25 +1736,25 @@ ok(hr == S_OK, "got 0x%08x (control: %d).\n", hr, i); hr = IFileDialogCustomize_AddRadioButtonList(pfdc, i); - todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_AddRadioButtonList(pfdc, ++i); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlState(pfdc, i, &cdstate); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - todo_wine ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, radiobutton1W); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, radiobutton1W); - todo_wine ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_SetControlLabel(pfdc, i, radiobutton2W); - todo_wine ok(hr == S_OK, "got 0x%08x (control: %d).\n", hr, i); + ok(hr == S_OK, "got 0x%08x (control: %d).\n", hr, i); hr = IFileDialogCustomize_AddCheckButton(pfdc, i, label, TRUE); - todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_AddCheckButton(pfdc, ++i, checkbutton1W, TRUE); ok(hr == S_OK, "got 0x%08x.\n", hr); @@ -1927,20 +1934,20 @@ cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - todo_wine ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_SetControlItemState(pfdc, i, 0, 0); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - todo_wine ok(cdstate == 0, "got 0x%08x.\n", cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == 0, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_SetControlItemState(pfdc, i, 0, CDCS_ENABLEDVISIBLE); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - todo_wine ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_RemoveAllControlItems(pfdc, i); ok(hr == E_NOTIMPL, "got 0x%08x.\n", hr); @@ -1970,7 +1977,6 @@ ok(hr == E_FAIL, "got 0x%08x.\n", hr); ok(selected == -1, "got %d.\n", selected); - todo_wine { cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); ok(hr == S_OK, "got 0x%08x.\n", hr); @@ -1987,7 +1993,6 @@ hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); ok(hr == S_OK, "got 0x%08x.\n", hr); ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); - } for(j = 0; j < 10; j++) { @@ -2012,7 +2017,7 @@ } hr = IFileDialogCustomize_AddRadioButtonList(pfdc, ++i); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) { DWORD selected = -1; @@ -2028,7 +2033,6 @@ ok(hr == E_FAIL, "got 0x%08x.\n", hr); ok(selected == -1, "got %d.\n", selected); - todo_wine { cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); ok(hr == S_OK, "got 0x%08x.\n", hr); @@ -2045,7 +2049,6 @@ hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); ok(hr == S_OK, "got 0x%08x.\n", hr); ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); - } for(j = 0; j < 10; j++) { @@ -2069,7 +2072,7 @@ } } hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, ++i); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) { DWORD selected = -1; @@ -2102,7 +2105,7 @@ ok(hr == S_OK, "got 0x%08x.\n", hr); ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_SetSelectedControlItem(pfdc, i, 0); - ok(hr == E_NOTIMPL, "got 0x%08x.\n", hr); + todo_wine ok(hr == E_NOTIMPL, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_RemoveAllControlItems(pfdc, i); ok(hr == E_NOTIMPL, "got 0x%08x.\n", hr); @@ -2233,7 +2236,7 @@ ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_MakeProminent(pfdc, id_vgroup1); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); IFileDialogCustomize_Release(pfdc); ref = IFileDialog_Release(pfod); @@ -2262,6 +2265,164 @@ ok(hr == S_OK, "got 0x%08x\n", hr); IFileDialog_Release(fd); +} + +static void test_overwrite(void) +{ + static const WCHAR filename_winetest[] = {'w','i','n','e','t','e','s','t','.','o','v','w',0}; + IFileDialogEventsImpl *pfdeimpl; + IFileDialogEvents *pfde; + IFileDialog *fd; + DWORD cookie; + LPWSTR filename; + IShellItem *psi_current; + WCHAR buf[MAX_PATH]; + HRESULT hr; + + GetCurrentDirectoryW(MAX_PATH, buf); + ok(!!pSHCreateItemFromParsingName, "SHCreateItemFromParsingName is missing.\n"); + hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psi_current); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + touch_file(filename_winetest); + + /* FOS_OVERWRITEPROMPT has no effect on open dialog */ + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetOptions(fd, FOS_OVERWRITEPROMPT | FOS_NOCHANGEDIR); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFolder(fd, psi_current); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->set_filename = filename_winetest; + hr = IFileDialog_Advise(fd, pfde, &cookie); + ok(hr == S_OK, "Advise failed: Got 0x%08x\n", hr); + + hr = IFileDialog_Show(fd, NULL); + ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); + + ok(!pfdeimpl->OnOverwrite, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); + + hr = IFileDialog_GetFileName(fd, &filename); + ok(hr == S_OK, "GetFileName failed: Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, filename_winetest), "Got %s\n", wine_dbgstr_w(filename)); + CoTaskMemFree(filename); + + hr = IFileDialog_Unadvise(fd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialog_Release(fd); + + IFileDialogEvents_Release(pfde); + + /* Save dialog doesn't check for overwrite without FOS_OVERWRITEPROMPT set */ + hr = CoCreateInstance(&CLSID_FileSaveDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetOptions(fd, FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFolder(fd, psi_current); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->set_filename = filename_winetest; + hr = IFileDialog_Advise(fd, pfde, &cookie); + ok(hr == S_OK, "Advise failed: Got 0x%08x\n", hr); + + hr = IFileDialog_Show(fd, NULL); + ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); + + ok(!pfdeimpl->OnOverwrite, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); + + hr = IFileDialog_GetFileName(fd, &filename); + ok(hr == S_OK, "GetFileName failed: Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, filename_winetest), "Got %s\n", wine_dbgstr_w(filename)); + CoTaskMemFree(filename); + + hr = IFileDialog_Unadvise(fd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialog_Release(fd); + + IFileDialogEvents_Release(pfde); + + /* Save dialog with FOS_OVERWRITEPROMPT set */ + hr = CoCreateInstance(&CLSID_FileSaveDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFolder(fd, psi_current); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->set_filename = filename_winetest; + hr = IFileDialog_Advise(fd, pfde, &cookie); + ok(hr == S_OK, "Advise failed: Got 0x%08x\n", hr); + + hr = IFileDialog_Show(fd, NULL); + ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); + + ok(pfdeimpl->OnOverwrite == 1, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); + + hr = IFileDialog_GetFileName(fd, &filename); + ok(hr == S_OK, "GetFileName failed: Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, filename_winetest), "Got %s\n", wine_dbgstr_w(filename)); + CoTaskMemFree(filename); + + hr = IFileDialog_Unadvise(fd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialog_Release(fd); + + IFileDialogEvents_Release(pfde); + + DeleteFileW(filename_winetest); + + /* Save dialog with FOS_OVERWRITEPROMPT set but without existing file */ + hr = CoCreateInstance(&CLSID_FileSaveDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFolder(fd, psi_current); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->set_filename = filename_winetest; + hr = IFileDialog_Advise(fd, pfde, &cookie); + ok(hr == S_OK, "Advise failed: Got 0x%08x\n", hr); + + hr = IFileDialog_Show(fd, NULL); + ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); + + ok(!pfdeimpl->OnOverwrite, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); + + hr = IFileDialog_GetFileName(fd, &filename); + ok(hr == S_OK, "GetFileName failed: Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, filename_winetest), "Got %s\n", wine_dbgstr_w(filename)); + CoTaskMemFree(filename); + + hr = IFileDialog_Unadvise(fd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialog_Release(fd); + + IFileDialogEvents_Release(pfde); + + IShellItem_Release(psi_current); } START_TEST(itemdlg) @@ -2277,6 +2438,7 @@ test_filename(); test_customize(); test_persistent_state(); + test_overwrite(); } else skip("Skipping all Item Dialog tests.\n"); Modified: trunk/rostests/winetests/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/printd… ============================================================================== --- trunk/rostests/winetests/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/printdlg.c [iso-8859-1] Wed Nov 25 14:26:11 2015 @@ -379,14 +379,16 @@ return; } - /* Set CommDlgExtendedError != 0 */ - PrintDlgA(NULL); - SetLastError(0xdeadbeef); - res = pPrintDlgExW(NULL); - ok( (res == E_INVALIDARG), - "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", - res, GetLastError(), CommDlgExtendedError()); - + if (0) /* Crashes on Win10 */ + { + /* Set CommDlgExtendedError != 0 */ + PrintDlgA(NULL); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(NULL); + ok( (res == E_INVALIDARG), + "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", + res, GetLastError(), CommDlgExtendedError() ); + } pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGEXW)) + 8); if (!pDlg) return;

1 0

[akhaldi] 70110: [PSDK] Fix a typo.
by akhaldi＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: akhaldi Date: Wed Nov 25 14:25:40 2015 New Revision: 70110 URL: http://svn.reactos.org/svn/reactos?rev=70110&view=rev Log: [PSDK] Fix a typo. Modified: trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Wed Nov 25 14:25:40 2015 @@ -3189,7 +3189,7 @@ typedef [v1_enum] enum FDE_OVERWRITE_RESPONSE { FDEOR_DEFAULT = 0, - FDEOR_ACCCEP = 1, + FDEOR_ACCEPT = 1, FDEOR_REFUSE = 2 } FDE_OVERWRITE_RESPONSE;

1 0

[akhaldi] 70109: [COMDLG32] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: akhaldi Date: Wed Nov 25 14:22:14 2015 New Revision: 70109 URL: http://svn.reactos.org/svn/reactos?rev=70109&view=rev Log: [COMDLG32] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/comdlg32/itemdlg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/itemdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] Wed Nov 25 14:22:14 2015 @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" @@ -53,6 +52,7 @@ static const WCHAR notifysink_childW[] = {'n','f','s','_','c','h','i','l','d',0}; static const WCHAR floatnotifysinkW[] = {'F','l','o','a','t','N','o','t','i','f','y','S','i','n','k',0}; +static const WCHAR radiobuttonlistW[] = {'R','a','d','i','o','B','u','t','t','o','n','L','i','s','t',0}; enum ITEMDLG_TYPE { ITEMDLG_TYPE_OPEN, @@ -68,8 +68,17 @@ IDLG_CCTRL_EDITBOX, IDLG_CCTRL_SEPARATOR, IDLG_CCTRL_TEXT, + IDLG_CCTRL_OPENDROPDOWN, IDLG_CCTRL_VISUALGROUP }; + +typedef struct cctrl_item { + DWORD id, parent_id; + LPWSTR label; + CDCONTROLSTATEF cdcstate; + HWND hwnd; + struct list entry; +} cctrl_item; typedef struct { HWND hwnd, wrapper_hwnd; @@ -80,6 +89,7 @@ struct list sub_cctrls; struct list sub_cctrls_entry; + struct list sub_items; } customctrl; typedef struct { @@ -134,6 +144,12 @@ UINT_PTR cctrl_next_dlgid; customctrl *cctrl_active_vg; + HMENU hmenu_opendropdown; + customctrl cctrl_opendropdown; + HFONT hfont_opendropdown; + BOOL opendropdown_has_selection; + DWORD opendropdown_selection; + GUID client_guid; } FileDialogImpl; @@ -214,6 +230,47 @@ TRACE("Notifying %p\n", cursor); IFileDialogEvents_OnTypeChange(cursor->pfde, (IFileDialog*)&This->IFileDialog2_iface); } +} + +static HRESULT events_OnOverwrite(FileDialogImpl *This, IShellItem *shellitem) +{ + events_client *cursor; + HRESULT hr = S_OK; + FDE_OVERWRITE_RESPONSE response = FDEOR_DEFAULT; + TRACE("%p %p\n", This, shellitem); + + LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry) + { + TRACE("Notifying %p\n", cursor); + hr = IFileDialogEvents_OnOverwrite(cursor->pfde, (IFileDialog*)&This->IFileDialog2_iface, shellitem, &response); + TRACE("<-- hr=%x response=%u\n", hr, response); + if(FAILED(hr) && hr != E_NOTIMPL) + break; + } + + if(hr == E_NOTIMPL) + hr = S_OK; + + if(SUCCEEDED(hr)) + { + if (response == FDEOR_DEFAULT) + { + WCHAR buf[100]; + int answer; + + LoadStringW(COMDLG32_hInstance, IDS_OVERWRITEFILE, buf, 100); + answer = MessageBoxW(This->dlg_hwnd, buf, This->custom_title, + MB_YESNO | MB_ICONEXCLAMATION); + if (answer == IDNO || answer == IDCANCEL) + { + hr = E_FAIL; + } + } + else if (response == FDEOR_REFUSE) + hr = E_FAIL; + } + + return hr; } static inline HRESULT get_cctrl_event(IFileDialogEvents *pfde, IFileDialogControlEvents **pfdce) @@ -243,7 +300,7 @@ static HRESULT cctrl_event_OnItemSelected(FileDialogImpl *This, DWORD ctl_id, DWORD item_id) { events_client *cursor; - TRACE("%p\n", This); + TRACE("%p %i %i\n", This, ctl_id, item_id); LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry) { @@ -424,6 +481,28 @@ return NULL; return ext; +} + +static BOOL shell_item_exists(IShellItem* shellitem) +{ + LPWSTR filename; + HRESULT hr; + BOOL result; + + hr = IShellItem_GetDisplayName(shellitem, SIGDN_FILESYSPATH, &filename); + if (SUCCEEDED(hr)) + { + /* FIXME: Implement SFGAO_VALIDATE in Wine and use it instead. */ + result = (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES); + CoTaskMemFree(filename); + } + else + { + SFGAOF attributes; + result = SUCCEEDED(IShellItem_GetAttributes(shellitem, SFGAO_VALIDATE, &attributes)); + } + + return result; } static HRESULT on_default_action(FileDialogImpl *This) @@ -592,6 +671,26 @@ } } + if((This->options & FOS_OVERWRITEPROMPT) && This->dlg_type == ITEMDLG_TYPE_SAVE) + { + IShellItem *shellitem; + + for (i=0; SUCCEEDED(hr) && i<file_count; i++) + { + hr = IShellItemArray_GetItemAt(This->psia_results, i, &shellitem); + if (SUCCEEDED(hr)) + { + if (shell_item_exists(shellitem)) + hr = events_OnOverwrite(This, shellitem); + + IShellItem_Release(shellitem); + } + } + + if (FAILED(hr)) + break; + } + if(events_OnFileOk(This) == S_OK) ret = S_OK; } @@ -611,6 +710,111 @@ return ret; } +static void show_opendropdown(FileDialogImpl *This) +{ + HWND open_hwnd; + RECT open_rc; + MSG msg; + + open_hwnd = GetDlgItem(This->dlg_hwnd, IDOK); + + GetWindowRect(open_hwnd, &open_rc); + + if (TrackPopupMenu(This->hmenu_opendropdown, 0, open_rc.left, open_rc.bottom, 0, This->dlg_hwnd, NULL) && + PeekMessageW(&msg, This->dlg_hwnd, WM_MENUCOMMAND, WM_MENUCOMMAND, PM_REMOVE)) + { + MENUITEMINFOW mii; + + This->opendropdown_has_selection = TRUE; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID; + GetMenuItemInfoW((HMENU)msg.lParam, msg.wParam, TRUE, &mii); + This->opendropdown_selection = mii.wID; + + if(SUCCEEDED(on_default_action(This))) + EndDialog(This->dlg_hwnd, S_OK); + else + This->opendropdown_has_selection = FALSE; + } +} + +/************************************************************************** + * Control item functions. + */ + +static void item_free(cctrl_item *item) +{ + DestroyWindow(item->hwnd); + HeapFree(GetProcessHeap(), 0, item->label); + HeapFree(GetProcessHeap(), 0, item); +} + +static cctrl_item* get_item(customctrl* parent, DWORD itemid, CDCONTROLSTATEF visible_flags, DWORD* position) +{ + DWORD dummy; + cctrl_item* item; + + if (!position) position = &dummy; + + *position = 0; + + LIST_FOR_EACH_ENTRY(item, &parent->sub_items, cctrl_item, entry) + { + if (item->id == itemid) + return item; + + if ((item->cdcstate & visible_flags) == visible_flags) + (*position)++; + } + + return NULL; +} + +static cctrl_item* get_first_item(customctrl* parent) +{ + cctrl_item* item; + + LIST_FOR_EACH_ENTRY(item, &parent->sub_items, cctrl_item, entry) + { + if ((item->cdcstate & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)) + return item; + } + + return NULL; +} + +static HRESULT add_item(customctrl* parent, DWORD itemid, LPCWSTR label, cctrl_item** result) +{ + cctrl_item* item; + LPWSTR label_copy; + + if (get_item(parent, itemid, 0, NULL)) + return E_INVALIDARG; + + item = HeapAlloc(GetProcessHeap(), 0, sizeof(*item)); + label_copy = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(label)+1)*sizeof(WCHAR)); + + if (!item || !label_copy) + { + HeapFree(GetProcessHeap(), 0, item); + HeapFree(GetProcessHeap(), 0, label_copy); + return E_OUTOFMEMORY; + } + + item->id = itemid; + item->parent_id = parent->id; + lstrcpyW(label_copy, label); + item->label = label_copy; + item->cdcstate = CDCS_VISIBLE|CDCS_ENABLED; + item->hwnd = NULL; + list_add_tail(&parent->sub_items, &item->entry); + + *result = item; + + return S_OK; +} + /************************************************************************** * Control functions. */ @@ -646,6 +850,8 @@ return sub_ctrl; } + if (This->hmenu_opendropdown && This->cctrl_opendropdown.id == ctlid) + return &This->cctrl_opendropdown; TRACE("No existing control with control id %d\n", ctlid); return NULL; @@ -702,6 +908,7 @@ static void ctrl_free(customctrl *ctrl) { customctrl *sub_cur1, *sub_cur2; + cctrl_item *item_cur1, *item_cur2; TRACE("Freeing control %p\n", ctrl); if(ctrl->type == IDLG_CCTRL_MENU) @@ -717,6 +924,12 @@ ctrl_free(sub_cur1); } + LIST_FOR_EACH_ENTRY_SAFE(item_cur1, item_cur2, &ctrl->sub_items, cctrl_item, entry) + { + list_remove(&item_cur1->entry); + item_free(item_cur1); + } + DestroyWindow(ctrl->hwnd); HeapFree(GetProcessHeap(), 0, ctrl); } @@ -725,6 +938,7 @@ { RECT rc; UINT total_height; + UINT max_width; customctrl *sub_ctrl; switch(ctrl->type) @@ -767,9 +981,36 @@ SWP_NOZORDER|SWP_NOMOVE); break; case IDLG_CCTRL_RADIOBUTTONLIST: + { + cctrl_item* item; + + total_height = 0; + max_width = 0; + + LIST_FOR_EACH_ENTRY(item, &ctrl->sub_items, cctrl_item, entry) + { + ctrl_resize(item->hwnd, 160, 160, TRUE); + SetWindowPos(item->hwnd, NULL, 0, total_height, 0, 0, + SWP_NOZORDER|SWP_NOSIZE); + + GetWindowRect(item->hwnd, &rc); + + total_height += rc.bottom - rc.top; + max_width = max(rc.right - rc.left, max_width); + } + + SetWindowPos(ctrl->hwnd, NULL, 0, 0, max_width, total_height, + SWP_NOZORDER|SWP_NOMOVE); + + SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, max_width, total_height, + SWP_NOZORDER|SWP_NOMOVE); + + break; + } case IDLG_CCTRL_EDITBOX: case IDLG_CCTRL_SEPARATOR: case IDLG_CCTRL_MENU: + case IDLG_CCTRL_OPENDROPDOWN: /* Nothing */ break; } @@ -936,6 +1177,7 @@ ctrl->dlgid = This->cctrl_next_dlgid; ctrl->cdcstate = CDCS_ENABLED | CDCS_VISIBLE; list_init(&ctrl->sub_cctrls); + list_init(&ctrl->sub_items); if(This->cctrl_active_vg) list_add_tail(&This->cctrl_active_vg->sub_cctrls, &ctrl->sub_cctrls_entry); @@ -1108,6 +1350,15 @@ if(font) SendMessageW(sub_ctrl->hwnd, WM_SETFONT, (WPARAM)font, TRUE); } + if (ctrl->type == IDLG_CCTRL_RADIOBUTTONLIST) + { + cctrl_item* item; + LIST_FOR_EACH_ENTRY(item, &ctrl->sub_items, cctrl_item, entry) + { + if (font) SendMessageW(item->hwnd, WM_SETFONT, (WPARAM)font, TRUE); + } + } + customctrl_resize(This, ctrl); } } @@ -1159,6 +1410,75 @@ } return FALSE; +} + +static void radiobuttonlist_set_selected_item(FileDialogImpl *This, customctrl *ctrl, cctrl_item *item) +{ + cctrl_item *cursor; + + LIST_FOR_EACH_ENTRY(cursor, &ctrl->sub_items, cctrl_item, entry) + { + SendMessageW(cursor->hwnd, BM_SETCHECK, (cursor == item) ? BST_CHECKED : BST_UNCHECKED, 0); + } +} + +static LRESULT radiobuttonlist_on_bn_clicked(FileDialogImpl *This, HWND hwnd, HWND child) +{ + DWORD ctrl_id = (DWORD)GetWindowLongPtrW(hwnd, GWLP_ID); + customctrl *ctrl; + cctrl_item *item; + BOOL found_item=FALSE; + + ctrl = get_cctrl_from_dlgid(This, ctrl_id); + + if (!ctrl) + { + ERR("Can't find this control\n"); + return 0; + } + + LIST_FOR_EACH_ENTRY(item, &ctrl->sub_items, cctrl_item, entry) + { + if (item->hwnd == child) + { + found_item = TRUE; + break; + } + } + + if (!found_item) + { + ERR("Can't find control item\n"); + return 0; + } + + radiobuttonlist_set_selected_item(This, ctrl, item); + + cctrl_event_OnItemSelected(This, ctrl->id, item->id); + + return 0; +} + +static LRESULT radiobuttonlist_on_wm_command(FileDialogImpl *This, HWND hwnd, WPARAM wparam, LPARAM lparam) +{ + switch(HIWORD(wparam)) + { + case BN_CLICKED: return radiobuttonlist_on_bn_clicked(This, hwnd, (HWND)lparam); + } + + return FALSE; +} + +static LRESULT CALLBACK radiobuttonlist_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + FileDialogImpl *This = (FileDialogImpl*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + + switch(message) + { + case WM_COMMAND: return radiobuttonlist_on_wm_command(This, hwnd, wparam, lparam); + } + + return DefWindowProcW(hwnd, message, wparam, lparam); } static HRESULT init_custom_controls(FileDialogImpl *This) @@ -1197,7 +1517,7 @@ This->cctrls_hwnd = CreateWindowExW(0, ctrl_container_classname, NULL, WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, NULL, 0, - COMDLG32_hInstance, (void*)This); + COMDLG32_hInstance, This); if(!This->cctrls_hwnd) return E_FAIL; @@ -1222,22 +1542,99 @@ ERR("Failed to register FloatNotifySink window class.\n"); } + if( !GetClassInfoW(COMDLG32_hInstance, radiobuttonlistW, &wc) || + wc.hInstance != COMDLG32_hInstance) + { + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = radiobuttonlist_proc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = COMDLG32_hInstance; + wc.hIcon = 0; + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszMenuName = NULL; + wc.lpszClassName = radiobuttonlistW; + + if (!RegisterClassW(&wc)) + ERR("Failed to register RadioButtonList window class.\n"); + } + return S_OK; } /************************************************************************** * Window related functions. */ +static BOOL update_open_dropdown(FileDialogImpl *This) +{ + /* Show or hide the open dropdown button as appropriate */ + BOOL show=FALSE, showing; + HWND open_hwnd, dropdown_hwnd; + + if (This->hmenu_opendropdown) + { + INT num_visible_items=0; + cctrl_item* item; + + LIST_FOR_EACH_ENTRY(item, &This->cctrl_opendropdown.sub_items, cctrl_item, entry) + { + if (item->cdcstate & CDCS_VISIBLE) + { + num_visible_items++; + if (num_visible_items >= 2) + { + show = TRUE; + break; + } + } + } + } + + open_hwnd = GetDlgItem(This->dlg_hwnd, IDOK); + dropdown_hwnd = GetDlgItem(This->dlg_hwnd, psh1); + + showing = (GetWindowLongPtrW(dropdown_hwnd, GWL_STYLE) & WS_VISIBLE) != 0; + + if (showing != show) + { + RECT open_rc, dropdown_rc; + + GetWindowRect(open_hwnd, &open_rc); + GetWindowRect(dropdown_hwnd, &dropdown_rc); + + if (show) + { + ShowWindow(dropdown_hwnd, SW_SHOW); + + SetWindowPos(open_hwnd, NULL, 0, 0, + (open_rc.right - open_rc.left) - (dropdown_rc.right - dropdown_rc.left), + open_rc.bottom - open_rc.top, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); + } + else + { + ShowWindow(dropdown_hwnd, SW_HIDE); + + SetWindowPos(open_hwnd, NULL, 0, 0, + (open_rc.right - open_rc.left) + (dropdown_rc.right - dropdown_rc.left), + open_rc.bottom - open_rc.top, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); + } + } + + return show; +} + static void update_layout(FileDialogImpl *This) { HDWP hdwp; HWND hwnd; RECT dialog_rc; - RECT cancel_rc, open_rc; + RECT cancel_rc, dropdown_rc, open_rc; RECT filetype_rc, filename_rc, filenamelabel_rc; RECT toolbar_rc, ebrowser_rc, customctrls_rc; static const UINT vspacing = 4, hspacing = 4; static const UINT min_width = 320, min_height = 200; + BOOL show_dropdown; if (!GetClientRect(This->dlg_hwnd, &dialog_rc)) { @@ -1270,6 +1667,30 @@ cancel_rc.bottom = cancel_rc.top + cancel_height; } + /* Open/Save dropdown */ + show_dropdown = update_open_dropdown(This); + + if(show_dropdown) + { + int dropdown_width, dropdown_height; + hwnd = GetDlgItem(This->dlg_hwnd, psh1); + + GetWindowRect(hwnd, &dropdown_rc); + dropdown_width = dropdown_rc.right - dropdown_rc.left; + dropdown_height = dropdown_rc.bottom - dropdown_rc.top; + + dropdown_rc.left = cancel_rc.left - dropdown_width - hspacing; + dropdown_rc.top = cancel_rc.top; + dropdown_rc.right = dropdown_rc.left + dropdown_width; + dropdown_rc.bottom = dropdown_rc.top + dropdown_height; + } + else + { + dropdown_rc.left = dropdown_rc.right = cancel_rc.left - hspacing; + dropdown_rc.top = cancel_rc.top; + dropdown_rc.bottom = cancel_rc.bottom; + } + /* Open/Save button */ hwnd = GetDlgItem(This->dlg_hwnd, IDOK); if(hwnd) @@ -1279,8 +1700,8 @@ open_width = open_rc.right - open_rc.left; open_height = open_rc.bottom - open_rc.top; - open_rc.left = cancel_rc.left - open_width - hspacing; - open_rc.top = cancel_rc.top; + open_rc.left = dropdown_rc.left - open_width; + open_rc.top = dropdown_rc.top; open_rc.right = open_rc.left + open_width; open_rc.bottom = open_rc.top + open_height; } @@ -1391,6 +1812,10 @@ DeferWindowPos(hdwp, hwnd, NULL, open_rc.left, open_rc.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); + if(hdwp && This->hmenu_opendropdown && (hwnd = GetDlgItem(This->dlg_hwnd, psh1))) + DeferWindowPos(hdwp, hwnd, NULL, dropdown_rc.left, dropdown_rc.top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); + if(hdwp && (hwnd = GetDlgItem(This->dlg_hwnd, IDCANCEL)) ) DeferWindowPos(hdwp, hwnd, NULL, cancel_rc.left, cancel_rc.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); @@ -1406,6 +1831,7 @@ static HRESULT init_explorerbrowser(FileDialogImpl *This) { IShellItem *psi_folder; + IObjectWithSite *client; FOLDERSETTINGS fos; RECT rc = {0}; HRESULT hr; @@ -1421,7 +1847,7 @@ return hr; } - IExplorerBrowser_SetOptions(This->peb, EBO_SHOWFRAMES); + IExplorerBrowser_SetOptions(This->peb, EBO_SHOWFRAMES | EBO_NOBORDER); hr = IExplorerBrowser_Initialize(This->peb, This->dlg_hwnd, &rc, NULL); if(FAILED(hr)) @@ -1442,9 +1868,14 @@ IExplorerBrowser_SetFolderSettings(This->peb, &fos); - hr = IUnknown_SetSite((IUnknown*)This->peb, (IUnknown*)This); - if(FAILED(hr)) - ERR("SetSite (ExplorerBrowser) failed.\n"); + hr = IExplorerBrowser_QueryInterface(This->peb, &IID_IObjectWithSite, (void**)&client); + if (hr == S_OK) + { + hr = IObjectWithSite_SetSite(client, (IUnknown*)&This->IFileDialog2_iface); + IObjectWithSite_Release(client); + if(FAILED(hr)) + ERR("SetSite failed, 0x%08x\n", hr); + } /* Browse somewhere */ psi_folder = This->psi_setfolder ? This->psi_setfolder : This->psi_defaultfolder; @@ -1489,13 +1920,21 @@ static void update_control_text(FileDialogImpl *This) { HWND hitem; + LPCWSTR custom_okbutton; + cctrl_item* item; + if(This->custom_title) SetWindowTextW(This->dlg_hwnd, This->custom_title); - if(This->custom_okbutton && + if(This->hmenu_opendropdown && (item = get_first_item(&This->cctrl_opendropdown))) + custom_okbutton = item->label; + else + custom_okbutton = This->custom_okbutton; + + if(custom_okbutton && (hitem = GetDlgItem(This->dlg_hwnd, IDOK))) { - SetWindowTextW(hitem, This->custom_okbutton); + SetWindowTextW(hitem, custom_okbutton); ctrl_resize(hitem, 50, 250, FALSE); } @@ -1512,6 +1951,25 @@ SetWindowTextW(hitem, This->custom_filenamelabel); ctrl_resize(hitem, 50, 250, FALSE); } +} + +static LRESULT CALLBACK dropdown_subclass_proc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam) +{ + static const WCHAR prop_this[] = {'i','t','e','m','d','l','g','_','T','h','i','s',0}; + static const WCHAR prop_oldwndproc[] = {'i','t','e','m','d','l','g','_','o','l','d','w','n','d','p','r','o','c',0}; + + if (umessage == WM_LBUTTONDOWN) + { + FileDialogImpl *This = (FileDialogImpl*)GetPropW(hwnd, prop_this); + + SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); + show_opendropdown(This); + SendMessageW(hwnd, BM_SETCHECK, BST_UNCHECKED, 0); + + return 0; + } + + return CallWindowProcW((WNDPROC)GetPropW(hwnd, prop_oldwndproc), hwnd, umessage, wparam, lparam); } static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) @@ -1569,6 +2027,37 @@ (hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAME)) ) SendMessageW(hitem, WM_SETTEXT, 0, (LPARAM)This->set_filename); + if(This->hmenu_opendropdown) + { + HWND dropdown_hwnd; + LOGFONTW lfw, lfw_marlett; + HFONT dialog_font; + static const WCHAR marlett[] = {'M','a','r','l','e','t','t',0}; + static const WCHAR prop_this[] = {'i','t','e','m','d','l','g','_','T','h','i','s',0}; + static const WCHAR prop_oldwndproc[] = {'i','t','e','m','d','l','g','_','o','l','d','w','n','d','p','r','o','c',0}; + + dropdown_hwnd = GetDlgItem(This->dlg_hwnd, psh1); + + /* Change dropdown button font to Marlett */ + dialog_font = (HFONT)SendMessageW(dropdown_hwnd, WM_GETFONT, 0, 0); + + GetObjectW(dialog_font, sizeof(lfw), &lfw); + + memset(&lfw_marlett, 0, sizeof(lfw_marlett)); + lstrcpyW(lfw_marlett.lfFaceName, marlett); + lfw_marlett.lfHeight = lfw.lfHeight; + lfw_marlett.lfCharSet = SYMBOL_CHARSET; + + This->hfont_opendropdown = CreateFontIndirectW(&lfw_marlett); + + SendMessageW(dropdown_hwnd, WM_SETFONT, (LPARAM)This->hfont_opendropdown, 0); + + /* Subclass button so we can handle LBUTTONDOWN */ + SetPropW(dropdown_hwnd, prop_this, (HANDLE)This); + SetPropW(dropdown_hwnd, prop_oldwndproc, + (HANDLE)SetWindowLongPtrW(dropdown_hwnd, GWLP_WNDPROC, (LONG_PTR)dropdown_subclass_proc)); + } + ctrl_container_reparent(This, This->dlg_hwnd); init_explorerbrowser(This); init_toolbar(This, hwnd); @@ -1578,7 +2067,10 @@ if(This->filterspec_count) events_OnTypeChange(This); - return TRUE; + if ((hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAME))) + SetFocus(hitem); + + return FALSE; } static LRESULT on_wm_size(FileDialogImpl *This) @@ -1613,6 +2105,9 @@ ctrl_container_reparent(This, NULL); This->dlg_hwnd = NULL; + DeleteObject(This->hfont_opendropdown); + This->hfont_opendropdown = NULL; + return TRUE; } @@ -1631,6 +2126,19 @@ TRACE("%p\n", This); EndDialog(This->dlg_hwnd, HRESULT_FROM_WIN32(ERROR_CANCELLED)); + + return FALSE; +} + +static LRESULT on_command_opendropdown(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) +{ + if(HIWORD(wparam) == BN_CLICKED) + { + HWND hwnd = (HWND)lparam; + SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); + show_opendropdown(This); + SendMessageW(hwnd, BM_SETCHECK, BST_UNCHECKED, 0); + } return FALSE; } @@ -1704,6 +2212,7 @@ { case IDOK: return on_idok(This); case IDCANCEL: return on_idcancel(This); + case psh1: return on_command_opendropdown(This, wparam, lparam); case IDC_NAVBACK: return on_browse_back(This); case IDC_NAVFORWARD: return on_browse_forward(This); case IDC_FILETYPE: return on_command_filetype(This, wparam, lparam); @@ -1852,6 +2361,9 @@ LocalFree(This->custom_cancelbutton); LocalFree(This->custom_filenamelabel); + DestroyMenu(This->hmenu_opendropdown); + DeleteObject(This->hfont_opendropdown); + HeapFree(GetProcessHeap(), 0, This); } @@ -1862,6 +2374,8 @@ { FileDialogImpl *This = impl_from_IFileDialog2(iface); TRACE("%p (%p)\n", iface, hwndOwner); + + This->opendropdown_has_selection = FALSE; return create_dialog(This, hwndOwner); } @@ -2172,7 +2686,7 @@ { FileDialogImpl *This = impl_from_IFileDialog2(iface); FIXME("stub - %p (%p, %d)\n", This, psi, fdap); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI IFileDialog2_fnSetDefaultExtension(IFileDialog2 *iface, LPCWSTR pszDefaultExtension) @@ -3199,8 +3713,32 @@ DWORD dwIDCtl) { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); - FIXME("stub - %p (%d)\n", This, dwIDCtl); - return E_NOTIMPL; + MENUINFO mi; + TRACE("%p (%d)\n", This, dwIDCtl); + + if (This->hmenu_opendropdown || get_cctrl(This, dwIDCtl)) + return E_UNEXPECTED; + + This->hmenu_opendropdown = CreatePopupMenu(); + + if (!This->hmenu_opendropdown) + return E_OUTOFMEMORY; + + mi.cbSize = sizeof(mi); + mi.fMask = MIM_STYLE; + mi.dwStyle = MNS_NOTIFYBYPOS; + SetMenuInfo(This->hmenu_opendropdown, &mi); + + This->cctrl_opendropdown.hwnd = NULL; + This->cctrl_opendropdown.wrapper_hwnd = NULL; + This->cctrl_opendropdown.id = dwIDCtl; + This->cctrl_opendropdown.dlgid = 0; + This->cctrl_opendropdown.type = IDLG_CCTRL_OPENDROPDOWN; + This->cctrl_opendropdown.cdcstate = CDCS_ENABLED | CDCS_VISIBLE; + list_init(&This->cctrl_opendropdown.sub_cctrls); + list_init(&This->cctrl_opendropdown.sub_items); + + return S_OK; } static HRESULT WINAPI IFileDialogCustomize_fnAddMenu(IFileDialogCustomize *iface, @@ -3272,8 +3810,18 @@ DWORD dwIDCtl) { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); - FIXME("stub - %p (%d)\n", This, dwIDCtl); - return E_NOTIMPL; + customctrl *ctrl; + HRESULT hr; + TRACE("%p (%d)\n", This, dwIDCtl); + + hr = cctrl_create_new(This, dwIDCtl, NULL, radiobuttonlistW, 0, 0, 0, &ctrl); + if(SUCCEEDED(hr)) + { + ctrl->type = IDLG_CCTRL_RADIOBUTTONLIST; + SetWindowLongPtrW(ctrl->hwnd, GWLP_USERDATA, (LPARAM)This); + } + + return hr; } static HRESULT WINAPI IFileDialogCustomize_fnAddCheckButton(IFileDialogCustomize *iface, @@ -3366,6 +3914,8 @@ case IDLG_CCTRL_VISUALGROUP: SendMessageW(ctrl->hwnd, WM_SETTEXT, 0, (LPARAM)pszLabel); break; + case IDLG_CCTRL_OPENDROPDOWN: + return E_NOTIMPL; default: break; } @@ -3381,7 +3931,7 @@ customctrl *ctrl = get_cctrl(This, dwIDCtl); TRACE("%p (%d, %p)\n", This, dwIDCtl, pdwState); - if(!ctrl) return E_NOTIMPL; + if(!ctrl || ctrl->type == IDLG_CCTRL_OPENDROPDOWN) return E_NOTIMPL; *pdwState = ctrl->cdcstate; return S_OK; @@ -3395,7 +3945,7 @@ customctrl *ctrl = get_cctrl(This,dwIDCtl); TRACE("%p (%d, %x)\n", This, dwIDCtl, dwState); - if(ctrl) + if(ctrl && ctrl->hwnd) { LONG wndstyle = GetWindowLongW(ctrl->hwnd, GWL_STYLE); @@ -3428,7 +3978,7 @@ WCHAR len, *text; TRACE("%p (%d, %p)\n", This, dwIDCtl, ppszText); - if(!ctrl || !(len = SendMessageW(ctrl->hwnd, WM_GETTEXTLENGTH, 0, 0))) + if(!ctrl || !ctrl->hwnd || !(len = SendMessageW(ctrl->hwnd, WM_GETTEXTLENGTH, 0, 0))) return E_FAIL; text = CoTaskMemAlloc(sizeof(WCHAR)*(len+1)); @@ -3462,7 +4012,7 @@ customctrl *ctrl = get_cctrl(This, dwIDCtl); TRACE("%p (%d, %p)\n", This, dwIDCtl, pbChecked); - if(ctrl) + if(ctrl && ctrl->hwnd) *pbChecked = (SendMessageW(ctrl->hwnd, BM_GETCHECK, 0, 0) == BST_CHECKED); return S_OK; @@ -3476,7 +4026,7 @@ customctrl *ctrl = get_cctrl(This, dwIDCtl); TRACE("%p (%d, %d)\n", This, dwIDCtl, bChecked); - if(ctrl) + if(ctrl && ctrl->hwnd) SendMessageW(ctrl->hwnd, BM_SETCHECK, bChecked ? BST_CHECKED:BST_UNCHECKED, 0); return S_OK; @@ -3504,6 +4054,7 @@ { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); customctrl *ctrl = get_cctrl(This, dwIDCtl); + HRESULT hr; TRACE("%p (%d, %d, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel)); if(!ctrl) return E_FAIL; @@ -3513,9 +4064,11 @@ case IDLG_CCTRL_COMBOBOX: { UINT index; - - if(get_combobox_index_from_id(ctrl->hwnd, dwIDItem) != -1) - return E_INVALIDARG; + cctrl_item* item; + + hr = add_item(ctrl, dwIDItem, pszLabel, &item); + + if (FAILED(hr)) return hr; index = SendMessageW(ctrl->hwnd, CB_ADDSTRING, 0, (LPARAM)pszLabel); SendMessageW(ctrl->hwnd, CB_SETITEMDATA, index, dwIDItem); @@ -3523,15 +4076,49 @@ return S_OK; } case IDLG_CCTRL_MENU: - { - TBBUTTON tbb; - SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); - - if(GetMenuState((HMENU)tbb.dwData, dwIDItem, MF_BYCOMMAND) != -1) - return E_INVALIDARG; - - AppendMenuW((HMENU)tbb.dwData, MF_STRING, dwIDItem, pszLabel); + case IDLG_CCTRL_OPENDROPDOWN: + { + cctrl_item* item; + HMENU hmenu; + + hr = add_item(ctrl, dwIDItem, pszLabel, &item); + + if (FAILED(hr)) return hr; + + if (ctrl->type == IDLG_CCTRL_MENU) + { + TBBUTTON tbb; + SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); + hmenu = (HMENU)tbb.dwData; + } + else /* ctrl->type == IDLG_CCTRL_OPENDROPDOWN */ + hmenu = This->hmenu_opendropdown; + + AppendMenuW(hmenu, MF_STRING, dwIDItem, pszLabel); return S_OK; + } + case IDLG_CCTRL_RADIOBUTTONLIST: + { + cctrl_item* item; + + hr = add_item(ctrl, dwIDItem, pszLabel, &item); + + if (SUCCEEDED(hr)) + { + item->hwnd = CreateWindowExW(0, WC_BUTTONW, pszLabel, + WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|BS_RADIOBUTTON|BS_MULTILINE, + 0, 0, 0, 0, ctrl->hwnd, ULongToHandle(dwIDItem), COMDLG32_hInstance, 0); + + if (!item->hwnd) + { + ERR("Failed to create radio button\n"); + list_remove(&item->entry); + item_free(item); + return E_FAIL; + } + } + + return hr; } default: break; @@ -3554,29 +4141,64 @@ { case IDLG_CCTRL_COMBOBOX: { - UINT i, count = SendMessageW(ctrl->hwnd, CB_GETCOUNT, 0, 0); - if(!count || (count == CB_ERR)) - return E_FAIL; - - for(i = 0; i < count; i++) - if(SendMessageW(ctrl->hwnd, CB_GETITEMDATA, i, 0) == dwIDItem) + cctrl_item* item; + DWORD position; + + item = get_item(ctrl, dwIDItem, CDCS_VISIBLE|CDCS_ENABLED, &position); + + if ((item->cdcstate & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)) + { + if(SendMessageW(ctrl->hwnd, CB_DELETESTRING, position, 0) == CB_ERR) + return E_FAIL; + } + + list_remove(&item->entry); + item_free(item); + + return S_OK; + } + case IDLG_CCTRL_MENU: + case IDLG_CCTRL_OPENDROPDOWN: + { + HMENU hmenu; + cctrl_item* item; + + item = get_item(ctrl, dwIDItem, 0, NULL); + + if (!item) + return E_UNEXPECTED; + + if (item->cdcstate & CDCS_VISIBLE) + { + if (ctrl->type == IDLG_CCTRL_MENU) { - if(SendMessageW(ctrl->hwnd, CB_DELETESTRING, i, 0) == CB_ERR) - return E_FAIL; - return S_OK; + TBBUTTON tbb; + SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); + hmenu = (HMENU)tbb.dwData; } - - return E_UNEXPECTED; - } - case IDLG_CCTRL_MENU: - { - TBBUTTON tbb; - HMENU hmenu; - SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); - hmenu = (HMENU)tbb.dwData; - - if(!hmenu || !DeleteMenu(hmenu, dwIDItem, MF_BYCOMMAND)) + else /* ctrl->type == IDLG_CCTRL_OPENDROPDOWN */ + hmenu = This->hmenu_opendropdown; + + if(!hmenu || !DeleteMenu(hmenu, dwIDItem, MF_BYCOMMAND)) + return E_UNEXPECTED; + } + + list_remove(&item->entry); + item_free(item); + + return S_OK; + } + case IDLG_CCTRL_RADIOBUTTONLIST: + { + cctrl_item* item; + + item = get_item(ctrl, dwIDItem, 0, NULL); + + if (!item) return E_UNEXPECTED; + + list_remove(&item->entry); + item_free(item); return S_OK; } @@ -3603,8 +4225,34 @@ CDCONTROLSTATEF *pdwState) { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); - FIXME("stub - %p\n", This); - return E_NOTIMPL; + customctrl *ctrl = get_cctrl(This, dwIDCtl); + TRACE("%p (%d, %d, %p)\n", This, dwIDCtl, dwIDItem, pdwState); + + if(!ctrl) return E_FAIL; + + switch(ctrl->type) + { + case IDLG_CCTRL_COMBOBOX: + case IDLG_CCTRL_MENU: + case IDLG_CCTRL_OPENDROPDOWN: + case IDLG_CCTRL_RADIOBUTTONLIST: + { + cctrl_item* item; + + item = get_item(ctrl, dwIDItem, 0, NULL); + + if (!item) + return E_UNEXPECTED; + + *pdwState = item->cdcstate; + + return S_OK; + } + default: + break; + } + + return E_FAIL; } static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemState(IFileDialogCustomize *iface, @@ -3613,8 +4261,122 @@ CDCONTROLSTATEF dwState) { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); - FIXME("stub - %p\n", This); - return E_NOTIMPL; + customctrl *ctrl = get_cctrl(This, dwIDCtl); + TRACE("%p (%d, %d, %x)\n", This, dwIDCtl, dwIDItem, dwState); + + if(!ctrl) return E_FAIL; + + switch(ctrl->type) + { + case IDLG_CCTRL_COMBOBOX: + { + cctrl_item* item; + BOOL visible, was_visible; + DWORD position; + + item = get_item(ctrl, dwIDItem, CDCS_VISIBLE|CDCS_ENABLED, &position); + + if (!item) + return E_UNEXPECTED; + + visible = ((dwState & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)); + was_visible = ((item->cdcstate & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)); + + if (visible && !was_visible) + { + SendMessageW(ctrl->hwnd, CB_INSERTSTRING, position, (LPARAM)item->label); + SendMessageW(ctrl->hwnd, CB_SETITEMDATA, position, dwIDItem); + } + else if (!visible && was_visible) + { + SendMessageW(ctrl->hwnd, CB_DELETESTRING, position, 0); + } + + item->cdcstate = dwState; + + return S_OK; + } + case IDLG_CCTRL_MENU: + case IDLG_CCTRL_OPENDROPDOWN: + { + HMENU hmenu; + cctrl_item* item; + CDCONTROLSTATEF prev_state; + DWORD position; + + item = get_item(ctrl, dwIDItem, CDCS_VISIBLE, &position); + + if (!item) + return E_UNEXPECTED; + + prev_state = item->cdcstate; + + if (ctrl->type == IDLG_CCTRL_MENU) + { + TBBUTTON tbb; + SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); + hmenu = (HMENU)tbb.dwData; + } + else /* ctrl->type == IDLG_CCTRL_OPENDROPDOWN */ + hmenu = This->hmenu_opendropdown; + + if (dwState & CDCS_VISIBLE) + { + if (prev_state & CDCS_VISIBLE) + { + /* change state */ + EnableMenuItem(hmenu, dwIDItem, + MF_BYCOMMAND|((dwState & CDCS_ENABLED) ? MFS_ENABLED : MFS_DISABLED)); + } + else + { + /* show item */ + MENUITEMINFOW mii; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID|MIIM_STATE|MIIM_STRING; + mii.fState = (dwState & CDCS_ENABLED) ? MFS_ENABLED : MFS_DISABLED; + mii.wID = dwIDItem; + mii.dwTypeData = item->label; + + InsertMenuItemW(hmenu, position, TRUE, &mii); + } + } + else if (prev_state & CDCS_VISIBLE) + { + /* hide item */ + DeleteMenu(hmenu, dwIDItem, MF_BYCOMMAND); + } + + item->cdcstate = dwState; + + if (ctrl->type == IDLG_CCTRL_OPENDROPDOWN) + { + update_control_text(This); + update_layout(This); + } + + return S_OK; + } + case IDLG_CCTRL_RADIOBUTTONLIST: + { + cctrl_item* item; + + item = get_item(ctrl, dwIDItem, CDCS_VISIBLE, NULL); + + if (!item) + return E_UNEXPECTED; + + /* Oddly, native allows setting this but doesn't seem to do anything with it. */ + item->cdcstate = dwState; + + return S_OK; + } + default: + break; + } + + return E_FAIL; } static HRESULT WINAPI IFileDialogCustomize_fnGetSelectedControlItem(IFileDialogCustomize *iface, @@ -3638,6 +4400,42 @@ *pdwIDItem = SendMessageW(ctrl->hwnd, CB_GETITEMDATA, index, 0); return S_OK; } + case IDLG_CCTRL_OPENDROPDOWN: + if (This->opendropdown_has_selection) + { + *pdwIDItem = This->opendropdown_selection; + return S_OK; + } + else + { + /* Return first enabled item. */ + cctrl_item* item = get_first_item(ctrl); + + if (item) + { + *pdwIDItem = item->id; + return S_OK; + } + + WARN("no enabled items in open dropdown\n"); + return E_FAIL; + } + case IDLG_CCTRL_RADIOBUTTONLIST: + { + cctrl_item* item; + + LIST_FOR_EACH_ENTRY(item, &ctrl->sub_items, cctrl_item, entry) + { + if (SendMessageW(item->hwnd, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + *pdwIDItem = item->id; + return S_OK; + } + } + + WARN("no checked items in radio button list\n"); + return E_FAIL; + } default: FIXME("Unsupported control type %d\n", ctrl->type); } @@ -3668,6 +4466,20 @@ return E_FAIL; return S_OK; + } + case IDLG_CCTRL_RADIOBUTTONLIST: + { + cctrl_item* item; + + item = get_item(ctrl, dwIDItem, 0, NULL); + + if (item) + { + radiobuttonlist_set_selected_item(This, ctrl, item); + return S_OK; + } + + return E_INVALIDARG; } default: FIXME("Unsupported control type %d\n", ctrl->type); @@ -3714,7 +4526,7 @@ { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); FIXME("stub - %p (%d)\n", This, dwIDCtl); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemText(IFileDialogCustomize *iface, @@ -3822,6 +4634,9 @@ fdimpl->client_guid = GUID_NULL; + fdimpl->hmenu_opendropdown = NULL; + fdimpl->hfont_opendropdown = NULL; + /* FIXME: The default folder setting should be restored for the * application if it was previously set. */ SHGetDesktopFolder(&psf); @@ -3832,12 +4647,12 @@ if(FAILED(hr)) { ERR("Failed to initialize custom controls (0x%08x).\n", hr); - IUnknown_Release((IUnknown*)fdimpl); + IFileDialog2_Release(&fdimpl->IFileDialog2_iface); return E_FAIL; } - hr = IUnknown_QueryInterface((IUnknown*)fdimpl, riid, ppv); - IUnknown_Release((IUnknown*)fdimpl); + hr = IFileDialog2_QueryInterface(&fdimpl->IFileDialog2_iface, riid, ppv); + IFileDialog2_Release(&fdimpl->IFileDialog2_iface); return hr; } 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] Wed Nov 25 14:22:14 2015 @@ -55,7 +55,7 @@ reactos/dll/win32/clusapi # Synced to WineStaging-1.7.47 reactos/dll/win32/comcat # Synced to WineStaging-1.7.47 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.55 reactos/dll/win32/compstui # Synced to WineStaging-1.7.47 reactos/dll/win32/credui # Synced to WineStaging-1.7.55 reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70108: * Sync up to trunk head.
by akhaldi＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: akhaldi Date: Wed Nov 25 11:00:39 2015 New Revision: 70108 URL: http://svn.reactos.org/svn/reactos?rev=70108&view=rev Log: * Sync up to trunk head. Added: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/main.c - copied unchanged from r70107, trunk/reactos/dll/directx/wine/d3dcompiler_43/main.c branches/ros-branch-0_4_0/reactos/dll/win32/iphlpapi/iphlpapi_reactos.c - copied unchanged from r70107, trunk/reactos/dll/win32/iphlpapi/iphlpapi_reactos.c branches/ros-branch-0_4_0/rostests/winetests/quartz/mpegsplit.c - copied unchanged from r70107, trunk/rostests/winetests/quartz/mpegsplit.c Removed: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/icon.c Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/Cell.cpp branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/Cell.h branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/GridView.cpp branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/GridView.h branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/MainWindow.cpp branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/MainWindow.h branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/lang/en-US.rc branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/de-DE.rc branches/ros-branch-0_4_0/reactos/base/applications/rapps_new/winmain.cpp branches/ros-branch-0_4_0/reactos/base/shell/explorer/CMakeLists.txt branches/ros-branch-0_4_0/reactos/base/shell/explorer/explorer.cpp branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/en-US.rc branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/ms-MY.rc branches/ros-branch-0_4_0/reactos/base/shell/explorer/precomp.h branches/ros-branch-0_4_0/reactos/base/shell/explorer/startmnucust.cpp branches/ros-branch-0_4_0/reactos/base/shell/explorer/trayprop.cpp branches/ros-branch-0_4_0/reactos/base/shell/rshell/misc.cpp branches/ros-branch-0_4_0/reactos/dll/directx/wine/amstream/mediastream.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/d3d8_private.h branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/device.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/surface.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/swapchain.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/vertexdeclaration.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/volume.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/d3d9_private.h branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/device.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/query.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/surface.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/swapchain.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/texture.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/vertexdeclaration.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/volume.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/blob.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/compiler.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/d3drm.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/d3drm_private.h branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/device.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/frame.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/texture.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/viewport.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/animation.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/effect.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/font.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/mesh.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/shader.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/skin.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/surface.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_43/d3dx9_43.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/ddraw.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/ddraw_private.h branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/device.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/main.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/surface.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/devenum/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/directx/wine/devenum/createdevenum.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/device.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/dinput_main.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/dinput_private.h branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/keyboard.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/mouse.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/dplayx/dplay.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/dplayx/dplobby.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/directx/wine/dxdiagn/container.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/dxdiagn/fil_data.idl branches/ros-branch-0_4_0/reactos/dll/directx/wine/dxdiagn/provider.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/qedit/samplegrabber.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/avisplit.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/fil_data.idl branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/filesource.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/filtergraph.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/filtermapper.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/mpegsplit.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/parser.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/pin.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/regsvr.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/systemclock.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/vmr9.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/waveparser.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/arb_program_shader.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/buffer.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/context.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/cs.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/device.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/directx.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/drawprim.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/gl_compat.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/glsl_shader.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/palette.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/query.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/resource.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/sampler.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/shader.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/shader_sm1.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/shader_sm4.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/state.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/stateblock.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/surface.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/swapchain.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/texture.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/utils.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/view.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/volume.c branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/wined3d.spec branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/wined3d_gl.h branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/wined3d_private.h branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/ntobjshex.cpp branches/ros-branch-0_4_0/reactos/dll/shellext/stobject/stobject.cpp branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.cpp branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/commctrl.c branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/imagelist.c branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/listview.c branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/propsheet.c branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/rebar.c branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/syslink.c branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/theme_button.c branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/toolbar.c branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/treeview.c branches/ros-branch-0_4_0/reactos/dll/win32/credui/credui.spec branches/ros-branch-0_4_0/reactos/dll/win32/credui/credui_main.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/brush.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/customlinecap.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/font.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/gdiplus.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/gdiplus.spec branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/gdiplus_private.h branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/graphics.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/graphicspath.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/image.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/imageattributes.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/matrix.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/metafile.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/pathiterator.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/pen.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/region.c branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/stringformat.c branches/ros-branch-0_4_0/reactos/dll/win32/imagehlp/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/win32/imagehlp/access.c branches/ros-branch-0_4_0/reactos/dll/win32/imagehlp/modify.c branches/ros-branch-0_4_0/reactos/dll/win32/imagehlp/precomp.h branches/ros-branch-0_4_0/reactos/dll/win32/iphlpapi/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/win32/iphlpapi/iphlpapi_main.c branches/ros-branch-0_4_0/reactos/dll/win32/iphlpapi/iphlpapi_private.h branches/ros-branch-0_4_0/reactos/dll/win32/kernel32/client/file/disk.c branches/ros-branch-0_4_0/reactos/dll/win32/kernel32/client/file/filename.c branches/ros-branch-0_4_0/reactos/dll/win32/localui/localui.c branches/ros-branch-0_4_0/reactos/dll/win32/msacm32/format.c branches/ros-branch-0_4_0/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c branches/ros-branch-0_4_0/reactos/dll/win32/msacm32/pcmconverter.c branches/ros-branch-0_4_0/reactos/dll/win32/msadp32.acm/msadp32.c branches/ros-branch-0_4_0/reactos/dll/win32/mscms/profile.c branches/ros-branch-0_4_0/reactos/dll/win32/mscms/transform.c branches/ros-branch-0_4_0/reactos/dll/win32/msctf/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/win32/msctf/categorymgr.c branches/ros-branch-0_4_0/reactos/dll/win32/msctf/inputprocessor.c branches/ros-branch-0_4_0/reactos/dll/win32/msctf/threadmgr.c branches/ros-branch-0_4_0/reactos/dll/win32/msi/media.c branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/domdoc.c branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/element.c branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/node.c branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/saxreader.c branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/xmlparser.idl branches/ros-branch-0_4_0/reactos/dll/win32/odbccp32/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/win32/odbccp32/odbccp32.c branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Da.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_De.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_En.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Es.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_He.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_It.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_No.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Si.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/oledlg_main.c branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/resource.h branches/ros-branch-0_4_0/reactos/dll/win32/riched20/caret.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/editor.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/editor.h branches/ros-branch-0_4_0/reactos/dll/win32/riched20/editstr.h branches/ros-branch-0_4_0/reactos/dll/win32/riched20/list.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/para.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/reader.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/rtf.h branches/ros-branch-0_4_0/reactos/dll/win32/riched20/run.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/style.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/txthost.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/txtsrv.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/undo.c branches/ros-branch-0_4_0/reactos/dll/win32/riched20/writer.c branches/ros-branch-0_4_0/reactos/dll/win32/secur32/thunks.c branches/ros-branch-0_4_0/reactos/dll/win32/secur32/wrapper.c branches/ros-branch-0_4_0/reactos/dll/win32/shell32/lang/de-DE.rc branches/ros-branch-0_4_0/reactos/dll/win32/shell32/shell32.cpp branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/de-DE.rc branches/ros-branch-0_4_0/reactos/dll/win32/shlwapi/ordinal.c branches/ros-branch-0_4_0/reactos/dll/win32/shlwapi/path.c branches/ros-branch-0_4_0/reactos/dll/win32/shlwapi/reg.c branches/ros-branch-0_4_0/reactos/dll/win32/usp10/bracket.c branches/ros-branch-0_4_0/reactos/dll/win32/usp10/indicsyllable.c branches/ros-branch-0_4_0/reactos/dll/win32/usp10/linebreak.c branches/ros-branch-0_4_0/reactos/dll/win32/usp10/mirror.c branches/ros-branch-0_4_0/reactos/dll/win32/usp10/shape.c branches/ros-branch-0_4_0/reactos/dll/win32/usp10/shaping.c branches/ros-branch-0_4_0/reactos/dll/win32/usp10/usp10.c branches/ros-branch-0_4_0/reactos/dll/win32/wbemprox/builtin.c branches/ros-branch-0_4_0/reactos/dll/win32/wbemprox/class.c branches/ros-branch-0_4_0/reactos/dll/win32/wbemprox/query.c branches/ros-branch-0_4_0/reactos/dll/win32/wbemprox/service.c branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/CMakeLists.txt branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/gifformat.c branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/regsvr.c branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/tiffformat.c branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/ungif.c branches/ros-branch-0_4_0/reactos/dll/win32/winhttp/request.c branches/ros-branch-0_4_0/reactos/dll/win32/winhttp/session.c branches/ros-branch-0_4_0/reactos/dll/win32/winhttp/url.c branches/ros-branch-0_4_0/reactos/dll/win32/winhttp/winhttp_private.h branches/ros-branch-0_4_0/reactos/dll/win32/wininet/http.c branches/ros-branch-0_4_0/reactos/dll/win32/wininet/internet.c branches/ros-branch-0_4_0/reactos/drivers/filesystems/fastfat/create.c branches/ros-branch-0_4_0/reactos/include/dxsdk/axcore.idl branches/ros-branch-0_4_0/reactos/include/dxsdk/d3dx9mesh.h branches/ros-branch-0_4_0/reactos/include/dxsdk/d3dx9shader.h branches/ros-branch-0_4_0/reactos/include/psdk/commctrl.h branches/ros-branch-0_4_0/reactos/include/psdk/d3d9.h branches/ros-branch-0_4_0/reactos/include/psdk/d3dcompiler.h branches/ros-branch-0_4_0/reactos/include/psdk/d3drmdef.h branches/ros-branch-0_4_0/reactos/include/psdk/d3drmobj.h branches/ros-branch-0_4_0/reactos/include/psdk/gdipluspixelformats.h branches/ros-branch-0_4_0/reactos/include/psdk/icm.h branches/ros-branch-0_4_0/reactos/include/psdk/mmreg.h branches/ros-branch-0_4_0/reactos/include/psdk/msctf.idl branches/ros-branch-0_4_0/reactos/include/psdk/odbcinst.h branches/ros-branch-0_4_0/reactos/include/psdk/sspi.h branches/ros-branch-0_4_0/reactos/include/psdk/tcpioctl.h branches/ros-branch-0_4_0/reactos/include/psdk/winbase.h branches/ros-branch-0_4_0/reactos/include/psdk/wincred.h branches/ros-branch-0_4_0/reactos/include/psdk/wingdi.h branches/ros-branch-0_4_0/reactos/include/psdk/winnls.h branches/ros-branch-0_4_0/reactos/include/reactos/wine/debug.h branches/ros-branch-0_4_0/reactos/include/reactos/wine/wined3d.h branches/ros-branch-0_4_0/reactos/include/reactos/wine/winternl.h branches/ros-branch-0_4_0/reactos/include/xdk/winnt_old.h branches/ros-branch-0_4_0/reactos/lib/rtl/timerqueue.c branches/ros-branch-0_4_0/reactos/lib/rtl/workitem.c branches/ros-branch-0_4_0/reactos/lib/sdk/crt/startup/mscmain.c branches/ros-branch-0_4_0/reactos/media/doc/README.WINE branches/ros-branch-0_4_0/reactos/media/rapps/pingus.txt branches/ros-branch-0_4_0/reactos/subsystems/win/basesrv/proc.c branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/semaphor.c branches/ros-branch-0_4_0/reactos/win32ss/user/user32/misc/stubs.c branches/ros-branch-0_4_0/reactos/win32ss/user/user32/windows/mdi.c branches/ros-branch-0_4_0/rosapps/applications/cmdutils/cat/ (props changed) branches/ros-branch-0_4_0/rosapps/applications/imagesoft/lang/no-NO.rc (props changed) branches/ros-branch-0_4_0/rosapps/applications/net/roshttpd/ (props changed) branches/ros-branch-0_4_0/rosapps/applications/sysutils/gettype/ (props changed) branches/ros-branch-0_4_0/rosapps/applications/sysutils/logevent/ (props changed) branches/ros-branch-0_4_0/rosapps/applications/sysutils/screenshot/ (props changed) branches/ros-branch-0_4_0/rosapps/templates/old_wordpad/lang/no-NO.rc (props changed) branches/ros-branch-0_4_0/rostests/ (props changed) branches/ros-branch-0_4_0/rostests/apitests/crt/static_construct.cpp branches/ros-branch-0_4_0/rostests/winetests/advapi32/cred.c branches/ros-branch-0_4_0/rostests/winetests/advapi32/registry.c branches/ros-branch-0_4_0/rostests/winetests/advapi32/security.c branches/ros-branch-0_4_0/rostests/winetests/amstream/amstream.c branches/ros-branch-0_4_0/rostests/winetests/comctl32/imagelist.c branches/ros-branch-0_4_0/rostests/winetests/comctl32/listview.c branches/ros-branch-0_4_0/rostests/winetests/comctl32/misc.c branches/ros-branch-0_4_0/rostests/winetests/comctl32/propsheet.c branches/ros-branch-0_4_0/rostests/winetests/comctl32/status.c branches/ros-branch-0_4_0/rostests/winetests/comctl32/toolbar.c branches/ros-branch-0_4_0/rostests/winetests/comctl32/treeview.c branches/ros-branch-0_4_0/rostests/winetests/comctl32/v6util.h branches/ros-branch-0_4_0/rostests/winetests/credui/credui.c branches/ros-branch-0_4_0/rostests/winetests/d3drm/d3drm.c branches/ros-branch-0_4_0/rostests/winetests/dinput/mouse.c branches/ros-branch-0_4_0/rostests/winetests/dxdiagn/container.c branches/ros-branch-0_4_0/rostests/winetests/gdiplus/image.c branches/ros-branch-0_4_0/rostests/winetests/gdiplus/metafile.c branches/ros-branch-0_4_0/rostests/winetests/imagehlp/integrity.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/actctx.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/codepage.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/comm.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/console.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/debugger.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/file.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/heap.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/loader.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/locale.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/path.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/pipe.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/process.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/sync.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/thread.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/time.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/toolhelp.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/virtual.c branches/ros-branch-0_4_0/rostests/winetests/kernel32/volume.c branches/ros-branch-0_4_0/rostests/winetests/msacm32/msacm.c branches/ros-branch-0_4_0/rostests/winetests/mscms/profile.c branches/ros-branch-0_4_0/rostests/winetests/msctf/inputprocessor.c branches/ros-branch-0_4_0/rostests/winetests/msvcrt/data.c branches/ros-branch-0_4_0/rostests/winetests/msvcrt/file.c branches/ros-branch-0_4_0/rostests/winetests/msvcrt/locale.c branches/ros-branch-0_4_0/rostests/winetests/msvcrt/printf.c branches/ros-branch-0_4_0/rostests/winetests/msvcrt/string.c branches/ros-branch-0_4_0/rostests/winetests/msvcrt/time.c branches/ros-branch-0_4_0/rostests/winetests/msxml3/domdoc.c branches/ros-branch-0_4_0/rostests/winetests/msxml3/saxreader.c branches/ros-branch-0_4_0/rostests/winetests/msxml3/xmlparser.idl branches/ros-branch-0_4_0/rostests/winetests/ntdll/CMakeLists.txt branches/ros-branch-0_4_0/rostests/winetests/ntdll/directory.c branches/ros-branch-0_4_0/rostests/winetests/ntdll/env.c branches/ros-branch-0_4_0/rostests/winetests/ntdll/exception.c branches/ros-branch-0_4_0/rostests/winetests/ntdll/file.c branches/ros-branch-0_4_0/rostests/winetests/ntdll/generated.c branches/ros-branch-0_4_0/rostests/winetests/ntdll/info.c branches/ros-branch-0_4_0/rostests/winetests/ntdll/om.c branches/ros-branch-0_4_0/rostests/winetests/ntdll/reg.c branches/ros-branch-0_4_0/rostests/winetests/ntdll/rtl.c branches/ros-branch-0_4_0/rostests/winetests/odbccp32/misc.c branches/ros-branch-0_4_0/rostests/winetests/quartz/CMakeLists.txt branches/ros-branch-0_4_0/rostests/winetests/quartz/fil_data.idl branches/ros-branch-0_4_0/rostests/winetests/quartz/filtergraph.c branches/ros-branch-0_4_0/rostests/winetests/quartz/filtermapper.c branches/ros-branch-0_4_0/rostests/winetests/quartz/testlist.c branches/ros-branch-0_4_0/rostests/winetests/riched20/editor.c branches/ros-branch-0_4_0/rostests/winetests/riched20/richole.c branches/ros-branch-0_4_0/rostests/winetests/shlwapi/ordinal.c branches/ros-branch-0_4_0/rostests/winetests/shlwapi/path.c branches/ros-branch-0_4_0/rostests/winetests/shlwapi/shreg.c branches/ros-branch-0_4_0/rostests/winetests/user32/input.c branches/ros-branch-0_4_0/rostests/winetests/usp10/usp10.c branches/ros-branch-0_4_0/rostests/winetests/wbemprox/query.c branches/ros-branch-0_4_0/rostests/winetests/windowscodecs/gifformat.c branches/ros-branch-0_4_0/rostests/winetests/windowscodecs/pngformat.c branches/ros-branch-0_4_0/rostests/winetests/windowscodecs/tiffformat.c branches/ros-branch-0_4_0/rostests/winetests/winhttp/notification.c branches/ros-branch-0_4_0/rostests/winetests/winhttp/url.c branches/ros-branch-0_4_0/rostests/winetests/winhttp/winhttp.c branches/ros-branch-0_4_0/rostests/winetests/wininet/http.c branches/ros-branch-0_4_0/rostests/winetests/wininet/internet.c branches/ros-branch-0_4_0/rostests/winetests/wininet/urlcache.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/Cell.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… Modified: branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/Cell.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… Modified: branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/GridView.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… Modified: branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/GridView.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… Modified: branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… Modified: branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/MainWindow.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… Modified: branches/ros-branch-0_4_0/reactos/base/applications/charmap_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… Modified: branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… Modified: branches/ros-branch-0_4_0/reactos/base/applications/rapps_new/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/startmnucust.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/trayprop.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… Modified: branches/ros-branch-0_4_0/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/amstream/mediastream.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/blob.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/compiler.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Removed: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/d3drm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/d3drm_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/frame.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/texture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3drm/viewport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/animation.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/effect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/mesh.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/shader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/skin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_36/surface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/d3dx9_43/d3dx9_43.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/dinput_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dplayx/dplobby.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dxdiagn/fil_data.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/dxdiagn/provider.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/qedit/samplegrabber.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/fil_data.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/systemclock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/vmr9.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/quartz/waveparser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/sampler.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/di… Modified: branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/ntobjshex.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/sh… Modified: branches/ros-branch-0_4_0/reactos/dll/shellext/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/sh… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Removed: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/icon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/credui/credui.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/credui/credui_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/imageattributes.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/pathiterator.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/imagehlp/access.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/imagehlp/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/kernel32/client/file/disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/localui/localui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msadp32.acm/msadp32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/mscms/transform.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msctf/categorymgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msxml3/xmlparser.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_He.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_It.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/oledlg_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/style.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/txthost.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/secur32/thunks.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/secur32/wrapper.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shlwapi/reg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/usp10/bracket.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/usp10/indicsyllable.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/usp10/linebreak.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/wbemprox/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/wbemprox/service.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/windowscodecs/ungif.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/winhttp/request.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/winhttp/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/winhttp/url.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/winhttp/winhttp_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… Modified: branches/ros-branch-0_4_0/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/driver… Modified: branches/ros-branch-0_4_0/reactos/include/dxsdk/axcore.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/dxsdk/d3dx9mesh.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/dxsdk/d3dx9shader.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/d3dcompiler.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/d3drmdef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/d3drmobj.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/gdipluspixelformats.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/icm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/odbcinst.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/sspi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/tcpioctl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/wincred.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/reactos/wine/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… Modified: branches/ros-branch-0_4_0/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/rt… Modified: branches/ros-branch-0_4_0/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/rt… Modified: branches/ros-branch-0_4_0/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/sd… Modified: branches/ros-branch-0_4_0/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… Modified: branches/ros-branch-0_4_0/reactos/media/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… Modified: branches/ros-branch-0_4_0/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/subsys… Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… Modified: branches/ros-branch-0_4_0/rostests/apitests/crt/static_construct.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/apite… Modified: branches/ros-branch-0_4_0/rostests/winetests/advapi32/cred.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/comctl32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/comctl32/v6util.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/credui/credui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/d3drm/d3drm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/imagehlp/integrity.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/comm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/toolhelp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msvcrt/data.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msvcrt/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msvcrt/printf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/msxml3/xmlparser.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/directory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/env.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/generated.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/odbccp32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/quartz/fil_data.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/quartz/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/shlwapi/shreg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/user32/input.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/winhttp/notification.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/winhttp/url.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet… Modified: branches/ros-branch-0_4_0/rostests/winetests/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rostests/winet…

1 0

[tfaber] 70107: [KERNEL32] - Set the full BOOL in CheckNameLegalDOS8Dot3, not just the low byte. Fixes some kernel32:file test failures.
by tfaber＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: tfaber Date: Wed Nov 25 10:06:03 2015 New Revision: 70107 URL: http://svn.reactos.org/svn/reactos?rev=70107&view=rev Log: [KERNEL32] - Set the full BOOL in CheckNameLegalDOS8Dot3, not just the low byte. Fixes some kernel32:file test failures. Modified: trunk/reactos/dll/win32/kernel32/client/file/filename.c Modified: trunk/reactos/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] Wed Nov 25 10:06:03 2015 @@ -328,6 +328,7 @@ { UNICODE_STRING Name; ANSI_STRING AnsiName; + BOOLEAN NameContainsSpaces; if(lpName == NULL || (lpOemName == NULL && OemNameSize != 0) || @@ -348,7 +349,9 @@ *pbNameLegal = RtlIsNameLegalDOS8Dot3(&Name, (lpOemName ? &AnsiName : NULL), - (BOOLEAN*)pbNameContainsSpaces); + &NameContainsSpaces); + if (*pbNameLegal && pbNameContainsSpaces) + *pbNameContainsSpaces = NameContainsSpaces; return TRUE; } @@ -370,6 +373,7 @@ UNICODE_STRING Name; ANSI_STRING AnsiName, AnsiInputName; NTSTATUS Status; + BOOLEAN NameContainsSpaces; if(lpName == NULL || (lpOemName == NULL && OemNameSize != 0) || @@ -400,7 +404,9 @@ *pbNameLegal = RtlIsNameLegalDOS8Dot3(&Name, (lpOemName ? &AnsiName : NULL), - (BOOLEAN*)pbNameContainsSpaces); + &NameContainsSpaces); + if (*pbNameLegal && pbNameContainsSpaces) + *pbNameContainsSpaces = NameContainsSpaces; RtlFreeUnicodeString(&Name);

1 0

[tkreuzer] 70106: [WIN32K] Apply the same fix for EngAcquireSemaphore to EngReleaseSemaphore. CORE-9779 #comment Yet another try please
by tkreuzer＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: tkreuzer Date: Wed Nov 25 01:55:14 2015 New Revision: 70106 URL: http://svn.reactos.org/svn/reactos?rev=70106&view=rev Log: [WIN32K] Apply the same fix for EngAcquireSemaphore to EngReleaseSemaphore. CORE-9779 #comment Yet another try please Modified: trunk/reactos/win32ss/gdi/eng/semaphor.c Modified: trunk/reactos/win32ss/gdi/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/semaphor.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/semaphor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/semaphor.c [iso-8859-1] Wed Nov 25 01:55:14 2015 @@ -68,7 +68,14 @@ { // www.osr.com/ddk/graphics/gdifncs_5u3r.htm PTHREADINFO W32Thread; - ASSERT(hsem); + + /* On Windows a NULL hsem is ignored */ + if (hsem == NULL) + { + DPRINT1("EngReleaseSemaphore called with hsem == NULL!\n"); + return; + } + W32Thread = PsGetThreadWin32Thread(PsGetCurrentThread()); if (W32Thread) --W32Thread->dwEngAcquireCount; ExReleaseResourceAndLeaveCriticalRegion((PERESOURCE)hsem);

1 0

[rnaumann] 70105: [EXPLORER] -Addendum to r70104: Uncheck the 'show seconds' checkbox before disabling it.
by rnaumann＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: rnaumann Date: Tue Nov 24 23:05:49 2015 New Revision: 70105 URL: http://svn.reactos.org/svn/reactos?rev=70105&view=rev Log: [EXPLORER] -Addendum to r70104: Uncheck the 'show seconds' checkbox before disabling it. Modified: trunk/reactos/base/shell/explorer/trayprop.cpp Modified: trunk/reactos/base/shell/explorer/trayprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traypr… ============================================================================== --- trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] Tue Nov 24 23:05:49 2015 @@ -123,6 +123,7 @@ } else { + SendMessage(hwndSeconds, BM_SETCHECK, BST_UNCHECKED, 0); EnableWindow(hwndSeconds, FALSE); lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_NOCLOCK); } @@ -140,6 +141,7 @@ } else { + SendMessage(hwndSeconds, BM_SETCHECK, BST_UNCHECKED, 0); EnableWindow(hwndSeconds, FALSE); lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_NOCLOCK); }

1 0

[rnaumann] 70104: [EXPLORER] -Reactivate the 'show seconds' functionality. -Enable the the controls depending on checkbox states
by rnaumann＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: rnaumann Date: Tue Nov 24 22:37:58 2015 New Revision: 70104 URL: http://svn.reactos.org/svn/reactos?rev=70104&view=rev Log: [EXPLORER] -Reactivate the 'show seconds' functionality. -Enable the the controls depending on checkbox states Modified: trunk/reactos/base/shell/explorer/trayprop.cpp Modified: trunk/reactos/base/shell/explorer/trayprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traypr… ============================================================================== --- trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] Tue Nov 24 22:37:58 2015 @@ -36,6 +36,7 @@ { HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive; HWND hwndTaskbarBitmap, hwndTrayBitmap; + HWND hwndAdvancedButton; BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive; LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL; BOOL bRet = FALSE; @@ -48,6 +49,8 @@ hwndClock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_CLOCK); hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS); hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS); + + hwndAdvancedButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_ICONCUST); if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive) { @@ -109,10 +112,10 @@ if (bHideInactive) { - /* FIXME: when the customize button is disabled, enable it. */ + EnableWindow(hwndAdvancedButton, TRUE); if(bShowClock) { - /* FIXME: when the seconds checkbox is disabled, enable it. */ + EnableWindow(hwndSeconds, TRUE); if(bShowSeconds) lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_SECONDS); else @@ -120,16 +123,16 @@ } else { - /* FIXME: when the seconds checkbox is enabled, disable it it. */ + EnableWindow(hwndSeconds, FALSE); lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_NOCLOCK); } } else { - /* FIXME: when the customize button is enabled, disable it. */ + EnableWindow(hwndAdvancedButton, FALSE); if(bShowClock) { - /* FIXME: when the seconds checkbox is disabled, enable it. */ + EnableWindow(hwndSeconds, TRUE); if(bShowSeconds) lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_SECONDS); else @@ -137,7 +140,7 @@ } else { - /* FIXME: when the seconds checkbox is enabled, disable it it. */ + EnableWindow(hwndSeconds, FALSE); lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_NOCLOCK); } } @@ -184,6 +187,7 @@ pPropInfo->hTaskbarWnd = hwnd; // FIXME: check buttons + CheckDlgButton(hwnd, IDC_TASKBARPROP_SECONDS, AdvancedSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); UpdateTaskbarBitmap(pPropInfo); } @@ -241,6 +245,8 @@ break; case PSN_APPLY: + AdvancedSettings.bShowSeconds = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS); + SaveSettingDword(szAdvancedSettingsKey, TEXT("ShowSeconds"), AdvancedSettings.bShowSeconds); break; }

1 0

[tkreuzer] 70103: [WIN32K] "Gracyfully" (i.e. ignore, like Windows does) handle hsem == NULL in EngAcquireSemaphore Should fix crash of QXL Virtual GPU driver installer CORE-9779 #comment Please re...
by tkreuzer＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: tkreuzer Date: Tue Nov 24 22:04:39 2015 New Revision: 70103 URL: http://svn.reactos.org/svn/reactos?rev=70103&view=rev Log: [WIN32K] "Gracyfully" (i.e. ignore, like Windows does) handle hsem == NULL in EngAcquireSemaphore Should fix crash of QXL Virtual GPU driver installer CORE-9779 #comment Please retest. Modified: trunk/reactos/win32ss/gdi/eng/semaphor.c Modified: trunk/reactos/win32ss/gdi/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/semaphor.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/semaphor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/semaphor.c [iso-8859-1] Tue Nov 24 22:04:39 2015 @@ -42,7 +42,14 @@ { // www.osr.com/ddk/graphics/gdifncs_14br.htm PTHREADINFO W32Thread; - ASSERT(hsem); + + /* On Windows a NULL hsem is ignored */ + if (hsem == NULL) + { + DPRINT1("EngAcquireSemaphore called with hsem == NULL!\n"); + return; + } + ExEnterCriticalRegionAndAcquireResourceExclusive((PERESOURCE)hsem); W32Thread = PsGetThreadWin32Thread(PsGetCurrentThread()); if (W32Thread) W32Thread->dwEngAcquireCount++;

1 0

[rnaumann] 70102: [EXPLORER] -Fix a parameter of OnCreateTaskbarPage(). Fix by Mark Jansen -Implement showing the notification area preview images. CORE-10560
by rnaumann＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: rnaumann Date: Tue Nov 24 21:43:07 2015 New Revision: 70102 URL: http://svn.reactos.org/svn/reactos?rev=70102&view=rev Log: [EXPLORER] -Fix a parameter of OnCreateTaskbarPage(). Fix by Mark Jansen -Implement showing the notification area preview images. CORE-10560 Modified: trunk/reactos/base/shell/explorer/trayprop.cpp Modified: trunk/reactos/base/shell/explorer/trayprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traypr… ============================================================================== --- trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] Tue Nov 24 21:43:07 2015 @@ -2,6 +2,7 @@ * ReactOS Explorer * * Copyright 2006 - 2007 Thomas Weidenmueller <w3seek(a)reactos.org> + * 2015 Robert Naumann <gonzomdx(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,54 +25,62 @@ { HWND hTaskbarWnd; HWND hStartWnd; - HWND hNotiWnd; - HWND hToolWnd; HBITMAP hTaskbarBitmap; + HBITMAP hTrayBitmap; } PROPSHEET_INFO, *PPROPSHEET_INFO; static BOOL UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo) { - HWND hwndLock, hwndHide, hwndGroup, hwndShowQL; - HWND hwndBitmap; - BOOL bLock, bHide, bGroup, bShowQL; - LPTSTR lpImageName = NULL; + HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive; + HWND hwndTaskbarBitmap, hwndTrayBitmap; + BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive; + LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL; BOOL bRet = FALSE; hwndLock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_LOCK); hwndHide = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDE); hwndGroup = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_GROUP); hwndShowQL = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SHOWQL); - - if (hwndLock && hwndHide && hwndGroup && hwndShowQL) + + hwndClock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_CLOCK); + hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS); + hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS); + + if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive) { bLock = (SendMessage(hwndLock, BM_GETCHECK, 0, 0) == BST_CHECKED); bHide = (SendMessage(hwndHide, BM_GETCHECK, 0, 0) == BST_CHECKED); bGroup = (SendMessage(hwndGroup, BM_GETCHECK, 0, 0) == BST_CHECKED); bShowQL = (SendMessage(hwndShowQL, BM_GETCHECK, 0, 0) == BST_CHECKED); + + bShowClock = (SendMessage(hwndClock, BM_GETCHECK, 0, 0) == BST_CHECKED); + bShowSeconds = (SendMessage(hwndSeconds, BM_GETCHECK, 0, 0) == BST_CHECKED); + bHideInactive = (SendMessage(hwndHideInactive, BM_GETCHECK, 0, 0) == BST_CHECKED); if (bHide) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_AUTOHIDE); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_AUTOHIDE); else if (bLock && bGroup && bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_GROUP_QL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_GROUP_QL); else if (bLock && !bGroup && !bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_NOGROUP_NOQL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_NOGROUP_NOQL); else if (bLock && bGroup && !bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_GROUP_NOQL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_GROUP_NOQL); else if (bLock && !bGroup && bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_NOGROUP_QL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_NOGROUP_QL); else if (!bLock && !bGroup && !bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL); else if (!bLock && bGroup && !bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_GROUP_NOQL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_GROUP_NOQL); else if (!bLock && !bGroup && bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_NOGROUP_QL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_NOGROUP_QL); else if (!bLock && bGroup && bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_GROUP_QL); - - if (lpImageName) + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_GROUP_QL); + + + if (lpTaskBarImageName) { if (pPropInfo->hTaskbarBitmap) { @@ -79,21 +88,83 @@ } pPropInfo->hTaskbarBitmap = (HBITMAP)LoadImage(hExplorerInstance, - lpImageName, + lpTaskBarImageName, IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); if (pPropInfo->hTaskbarBitmap) { - hwndBitmap = GetDlgItem(pPropInfo->hTaskbarWnd, + hwndTaskbarBitmap = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_TASKBARBITMAP); - if (hwndBitmap) + if (hwndTaskbarBitmap) { - SendMessage(hwndBitmap, + SendMessage(hwndTaskbarBitmap, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)pPropInfo->hTaskbarBitmap); + } + } + } + + if (bHideInactive) + { + /* FIXME: when the customize button is disabled, enable it. */ + if(bShowClock) + { + /* FIXME: when the seconds checkbox is disabled, enable it. */ + if(bShowSeconds) + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_SECONDS); + else + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_CLOCK); + } + else + { + /* FIXME: when the seconds checkbox is enabled, disable it it. */ + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_NOCLOCK); + } + } + else + { + /* FIXME: when the customize button is enabled, disable it. */ + if(bShowClock) + { + /* FIXME: when the seconds checkbox is disabled, enable it. */ + if(bShowSeconds) + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_SECONDS); + else + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_CLOCK); + } + else + { + /* FIXME: when the seconds checkbox is enabled, disable it it. */ + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_NOCLOCK); + } + } + + if(lpTrayImageName) + { + if (pPropInfo->hTrayBitmap) + { + DeleteObject(pPropInfo->hTrayBitmap); + } + + pPropInfo->hTrayBitmap = (HBITMAP)LoadImage(hExplorerInstance, + lpTrayImageName, + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + if (pPropInfo->hTrayBitmap) + { + hwndTrayBitmap = GetDlgItem(pPropInfo->hTaskbarWnd, + IDC_TASKBARPROP_NOTIFICATIONBITMAP); + if (hwndTrayBitmap) + { + SendMessage(hwndTrayBitmap, + STM_SETIMAGE, + IMAGE_BITMAP, + (LPARAM)pPropInfo->hTrayBitmap); } } } @@ -136,7 +207,7 @@ switch (uMsg) { case WM_INITDIALOG: - OnCreateTaskbarPage(hwndDlg, (PPROPSHEET_INFO)lParam); + OnCreateTaskbarPage(hwndDlg, (PPROPSHEET_INFO)((LPPROPSHEETPAGE)lParam)->lParam); break; case WM_COMMAND: @@ -146,6 +217,9 @@ case IDC_TASKBARPROP_HIDE: case IDC_TASKBARPROP_GROUP: case IDC_TASKBARPROP_SHOWQL: + case IDC_TASKBARPROP_HIDEICONS: + case IDC_TASKBARPROP_CLOCK: + case IDC_TASKBARPROP_SECONDS: if (HIWORD(wParam) == BN_CLICKED) { UpdateTaskbarBitmap(pPropInfo); @@ -177,6 +251,10 @@ if (pPropInfo->hTaskbarBitmap) { DeleteObject(pPropInfo->hTaskbarBitmap); + } + if (pPropInfo->hTrayBitmap) + { + DeleteObject(pPropInfo->hTrayBitmap); } break;

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