Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 47965: [NTOSKRNL] Implement volume mount notification in RawFS
by pschweitzer＠svn.reactos.org 07 Jul '10

07 Jul '10

Author: pschweitzer Date: Wed Jul 7 20:27:04 2010 New Revision: 47965 URL: http://svn.reactos.org/svn/reactos?rev=47965&view=rev Log: [NTOSKRNL] Implement volume mount notification in RawFS Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Wed Jul 7 20:27:04 2010 @@ -312,6 +312,7 @@ NTSTATUS Status; PDEVICE_OBJECT DeviceObject; PVOLUME_DEVICE_OBJECT Volume; + PFILE_OBJECT FileObject = NULL; PAGED_CODE(); /* Remember our owner */ @@ -349,6 +350,36 @@ Volume->DeviceObject.SectorSize = DeviceObject->SectorSize; Volume->DeviceObject.Flags |= DO_DIRECT_IO; Volume->DeviceObject.Flags &= ~DO_DEVICE_INITIALIZING; + + /* Try to get associated FO (for notification) */ + _SEH2_TRY + { + FileObject = IoCreateStreamFileObjectLite(NULL, + &(Volume->DeviceObject)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* If failed, delete devive */ + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice((PDEVICE_OBJECT)Volume); + return Status; + } + + /* Increment OpenCount by two to avoid dismount when RawClose() will be called on ObDereferenceObject() */ + Volume->Vcb.OpenCount += 2; + /* Notify for sucessful mount */ + FsRtlNotifyVolumeEvent(FileObject, FSRTL_VOLUME_MOUNT); + /* Decrease refcount to 0 to make FileObject being released */ + ObDereferenceObject(FileObject); + /* It's not open anymore, go back to 0 */ + Volume->Vcb.OpenCount -= 2; + return Status; }

1 0

[spetreolle] 47964: [CRT] -Export memmove_s and memcpy_s -Implement rnd_s
by spetreolle＠svn.reactos.org 07 Jul '10

07 Jul '10

Author: spetreolle Date: Wed Jul 7 20:05:47 2010 New Revision: 47964 URL: http://svn.reactos.org/svn/reactos?rev=47964&view=rev Log: [CRT] -Export memmove_s and memcpy_s -Implement rnd_s Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/math/rand.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Wed Jul 7 20:05:47 2010 @@ -1266,9 +1266,9 @@ @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) -# @ cdecl memcpy_s(ptr long ptr long) memmove_s +@ cdecl memcpy_s(ptr long ptr long) memmove_s @ cdecl memmove(ptr ptr long) -# @ cdecl memmove_s(ptr long ptr long) +@ cdecl memmove_s(ptr long ptr long) @ cdecl memset(ptr long long) @ cdecl mktime(ptr) @ cdecl modf(double ptr) @@ -1285,7 +1285,7 @@ # stub qsort_s @ cdecl raise(long) @ cdecl rand() -# @ cdecl rand_s(ptr) +@ cdecl rand_s(ptr) @ cdecl realloc(ptr long) @ cdecl remove(str) @ cdecl rename(str str) @@ -1405,3 +1405,6 @@ @ varargs wscanf(wstr) # @ varargs wscanf_s(wstr) +# Functions not exported in native dll: +@ cdecl _get_invalid_parameter_handler() +@ cdecl _set_invalid_parameter_handler(ptr) Modified: trunk/reactos/lib/sdk/crt/math/rand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/rand.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/rand.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/rand.c [iso-8859-1] Wed Jul 7 20:05:47 2010 @@ -1,6 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> -//#include <Ntsecapi.h> +#include <ntsecapi.h> #include <internal/tls.h> /* @@ -31,12 +31,17 @@ */ int CDECL rand_s(unsigned int *pval) { -#if 0 - if (!pval || !RtlGenRandom(pval, sizeof(*pval))) + BOOLEAN (WINAPI *pSystemFunction036)(PVOID, ULONG); // RtlGenRandom + HINSTANCE hadvapi32 = LoadLibraryA("advapi32.dll"); + pSystemFunction036 = (void*)GetProcAddress(hadvapi32, "SystemFunction036"); +#if 1 + if (!pval || (pSystemFunction036 && !pSystemFunction036(pval, sizeof(*pval)))) { + _invalid_parameter(NULL,_CRT_WIDE("rand_s"),_CRT_WIDE(__FILE__),__LINE__, 0); *_errno() = EINVAL; return EINVAL; } #endif + if(hadvapi32) FreeLibrary(hadvapi32); return 0; }

1 0

[dreimer] 47963: Ukrainian translation Update for taskmgr (Igor Paliychuk)
by dreimer＠svn.reactos.org 07 Jul '10

07 Jul '10

Author: dreimer Date: Wed Jul 7 17:45:49 2010 New Revision: 47963 URL: http://svn.reactos.org/svn/reactos?rev=47963&view=rev Log: Ukrainian translation Update for taskmgr (Igor Paliychuk) Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] Wed Jul 7 17:45:49 2010 @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // Ukrainian resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR) +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT #pragma code_page(1251) @@ -46,7 +46,7 @@ MENUITEM SEPARATOR MENUITEM "&Âåëèê³ çíà÷êè", ID_VIEW_LARGE MENUITEM "&Äð³áí³ çíà÷êè", ID_VIEW_SMALL - MENUITEM "&Òàáëèöÿ", ID_VIEW_DETAILS, CHECKED + MENUITEM "Ä&åòàëüíî", ID_VIEW_DETAILS, CHECKED MENUITEM "Â&èáðàòè ñòîâïö³...", ID_VIEW_SELECTCOLUMNS POPUP "&Õðîíîëîã³ÿ ÖÏ" BEGIN @@ -92,7 +92,7 @@ MENUITEM SEPARATOR MENUITEM "&Âåëèê³ çíà÷êè", ID_VIEW_LARGE MENUITEM "&Äð³áí³ çíà÷êè", ID_VIEW_SMALL - MENUITEM "&Òàáëèöÿ", ID_VIEW_DETAILS, CHECKED + MENUITEM "Ä&åòàëüíî", ID_VIEW_DETAILS, CHECKED END END @@ -178,9 +178,9 @@ BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "&Íîâå çàâäàííÿ...",IDC_NEWTASK,187,189,53,14 - PUSHBUTTON "Ï&åðåêëþ÷èòèñÿ",IDC_SWITCHTO,131,189,53,14,WS_DISABLED - PUSHBUTTON "Çí&ÿòè çàâäàííÿ",IDC_ENDTASK,75,189,53,14,WS_DISABLED + PUSHBUTTON "&Íîâå çàâäàííÿ...",IDC_NEWTASK,181,189,60,14 + PUSHBUTTON "Ï&åðåêëþ÷èòèñÿ",IDC_SWITCHTO,120,189,55,14,WS_DISABLED + PUSHBUTTON "Çí&ÿòè çàâäàííÿ",IDC_ENDTASK,58,189,56,14,WS_DISABLED END IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 @@ -190,9 +190,9 @@ CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "Çí&ÿòè çàâäàííÿ",IDC_ENDPROCESS,171,189,69,14 + PUSHBUTTON "Çí&ÿòè ïðîöåñ",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Â³äîáðàæàòè ïðîöåñè âñ³õ êîðèñòóâà÷³â",IDC_SHOWALLPROCESSES, - "Êíîïêà",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,147,10 END //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 @@ -200,13 +200,13 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT - GROUPBOX "Âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Âèêîðèñ. ÖÏ",IDC_CPU_USAGE_FRAME,5,5,62,54,0,WS_EX_TRANSPARENT + GROUPBOX "Âèêîðèñ. ïàì'ÿò³",IDC_MEM_USAGE_FRAME,5,63,62,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Óñüîãî",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Âèä³ëåííÿ ïàì'ÿò³ (ÊÁ)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Ô³çè÷íà ïàì'ÿòü (ÊÁ)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Ïàì'ÿòü ÿäðà (ÊÁ)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "Äåñêðèïòîð³â",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Äåñêðèïòîð³â",IDS_TOTALS_HANDLE_COUNT,12,131,47,8 LTEXT "Ïîòîê³â",IDS_TOTALS_THREAD_COUNT,12,140,27,8 LTEXT "Ïðîöåñ³â",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | @@ -216,8 +216,8 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Óñüîãî",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Ìåæà",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER - LTEXT "Ï³ê",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + LTEXT "Ìåæà",IDS_COMMIT_CHARGE_LIMIT,12,184,18,8,NOT WS_BORDER + LTEXT "Ï³ê",IDS_COMMIT_CHARGE_PEAK,12,193,18,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | @@ -225,29 +225,27 @@ EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Óñüîãî",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "Äîñòóïíî",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "Ñèñòåìíèé êåø",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + LTEXT "Äîñòóïíî",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,32,8 + LTEXT "Ñèñòåìíèé êåø",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,53,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,188,131,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,188,140,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,188,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Óñüîãî",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "Âèâàíòàæóâàíà",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "Íåâèâàíòàæóâàíà",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + LTEXT "Âèâàíòàæóâàíà",IDS_KERNEL_MEMORY_PAGED,137,184,53,8 + LTEXT "Íåâèâàíòàæóâàíà",IDS_KERNEL_MEMORY_NONPAGED,137,193,61,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,198,174,35,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_KERNEL_MEMORY_PAGED,198,184,35,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,198,193,35,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Õðîíîëîã³ÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT GROUPBOX "Õðîíîëîã³ÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "Â³äîáðàæåííÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP, - WS_EX_CLIENTEDGE - PUSHBUTTON "Â³äîáðàæåííÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP, - WS_EX_CLIENTEDGE + PUSHBUTTON "Â³äîáðàæåííÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "Â³äîáðàæåííÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "Õðîíîëîã³ÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "Õðîíîëîã³ÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, @@ -628,7 +626,7 @@ IDS_MENU_WINDOWS "Â&³êíà" IDS_MENU_LARGEICONS "&Âåëèê³ çíà÷êè" IDS_MENU_SMALLICONS "&Äð³áí³ çíà÷êè" - IDS_MENU_DETAILS "&Òàáëèöÿ" + IDS_MENU_DETAILS "&Äåòàëüíî" IDS_MENU_ONEGRAPHALLCPUS "&Îäèí ãðàô³ê äëÿ âñ³õ ÖÏ" IDS_MENU_ONEGRAPHPERCPU "Îêðåìèé &ãðàô³ê äëÿ êîæíîãî ÖÏ" IDS_MENU_CPUHISTORY "&Õðîíîëîã³ÿ ÖÏ"

1 0

[dreimer] 47962: This was not meant to be committed at all. the recent resources were much better and should stay
by dreimer＠svn.reactos.org 07 Jul '10

07 Jul '10

Author: dreimer Date: Wed Jul 7 14:10:19 2010 New Revision: 47962 URL: http://svn.reactos.org/svn/reactos?rev=47962&view=rev Log: This was not meant to be committed at all. the recent resources were much better and should stay Modified: trunk/reactos/dll/win32/user32/resources/obm_close.bmp trunk/reactos/dll/win32/user32/resources/obm_mnarrow.bmp trunk/reactos/dll/win32/user32/resources/ocr_appstarting.cur trunk/reactos/dll/win32/user32/resources/ocr_cross.cur trunk/reactos/dll/win32/user32/resources/ocr_dragobject.cur trunk/reactos/dll/win32/user32/resources/ocr_hand.cur trunk/reactos/dll/win32/user32/resources/ocr_help.cur trunk/reactos/dll/win32/user32/resources/ocr_ibeam.cur trunk/reactos/dll/win32/user32/resources/ocr_icon.cur trunk/reactos/dll/win32/user32/resources/ocr_no.cur trunk/reactos/dll/win32/user32/resources/ocr_normal.cur trunk/reactos/dll/win32/user32/resources/ocr_size.cur trunk/reactos/dll/win32/user32/resources/ocr_sizeall.cur trunk/reactos/dll/win32/user32/resources/ocr_sizenesw.cur trunk/reactos/dll/win32/user32/resources/ocr_sizens.cur trunk/reactos/dll/win32/user32/resources/ocr_sizenwse.cur trunk/reactos/dll/win32/user32/resources/ocr_sizewe.cur trunk/reactos/dll/win32/user32/resources/ocr_up.cur trunk/reactos/dll/win32/user32/resources/ocr_wait.cur trunk/reactos/dll/win32/user32/resources/oic_bang.ico trunk/reactos/dll/win32/user32/resources/oic_hand.ico trunk/reactos/dll/win32/user32/resources/oic_note.ico trunk/reactos/dll/win32/user32/resources/oic_ques.ico trunk/reactos/dll/win32/user32/resources/oic_sample.ico Modified: trunk/reactos/dll/win32/user32/resources/obm_close.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/obm_mnarrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_appstarting.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_cross.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_dragobject.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_hand.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_help.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_ibeam.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_icon.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_no.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_normal.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_size.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizeall.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizenesw.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizens.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizenwse.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizewe.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_up.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_wait.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/oic_bang.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/oic_hand.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/oic_note.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/oic_ques.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/oic_sample.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available.

1 0

[dreimer] 47961: Sync devenum, atl, comctl32, comdlg32, cryptdlg, cryptui, hhctrl, itss, jscript, mapi32, msacm32, mshtml, msi, msimtf, oleacc, pstorec, shdoclc, shdocvw, shlwapi, snmpapi, urlmon, usp10, uxtheme, windowscodecs, wldap32, wtsapi32, wuapi, xinput1_3
by dreimer＠svn.reactos.org 06 Jul '10

06 Jul '10

Author: dreimer Date: Tue Jul 6 23:29:26 2010 New Revision: 47961 URL: http://svn.reactos.org/svn/reactos?rev=47961&view=rev Log: Sync devenum, atl, comctl32, comdlg32, cryptdlg, cryptui, hhctrl, itss, jscript, mapi32, msacm32, mshtml, msi, msimtf, oleacc, pstorec, shdoclc, shdocvw, shlwapi, snmpapi, urlmon, usp10, uxtheme, windowscodecs, wldap32, wtsapi32, wuapi, xinput1_3 Added: trunk/reactos/dll/win32/comctl32/comctl_Da.rc (with props) trunk/reactos/dll/win32/cryptui/cryptui_Ro.rc (with props) trunk/reactos/dll/win32/jscript/jscript_No.rc (with props) trunk/reactos/dll/win32/mapi32/No.rc (with props) trunk/reactos/dll/win32/shdoclc/It.rc (with props) trunk/reactos/dll/win32/shdoclc/Ja.rc (with props) trunk/reactos/dll/win32/shdoclc/Pl.rc (with props) trunk/reactos/dll/win32/usp10/mirror.c (with props) trunk/reactos/dll/win32/usp10/shape.c (with props) trunk/reactos/dll/win32/usp10/shaping.c (with props) trunk/reactos/dll/win32/windowscodecs/fliprotate.c (with props) trunk/reactos/dll/win32/wldap32/wldap32_Hu.rc (with props) trunk/reactos/dll/win32/wldap32/wldap32_It.rc (with props) Removed: trunk/reactos/dll/win32/msacm32/Makefile.in trunk/reactos/dll/win32/odbc32/Makefile.in trunk/reactos/dll/win32/pstorec/pstorec_ros.diff trunk/reactos/dll/win32/snmpapi/debug.h trunk/reactos/dll/win32/snmpapi/snmpapi.c trunk/reactos/dll/win32/twain_32/Makefile.in Modified: trunk/reactos/dll/directx/devenum/createdevenum.c trunk/reactos/dll/directx/devenum/devenum.rbuild trunk/reactos/dll/directx/devenum/devenum.rc trunk/reactos/dll/directx/devenum/devenum.spec trunk/reactos/dll/directx/devenum/devenum_main.c trunk/reactos/dll/directx/devenum/devenum_private.h trunk/reactos/dll/directx/devenum/factory.c trunk/reactos/dll/directx/devenum/mediacatenum.c trunk/reactos/dll/directx/devenum/parsedisplayname.c trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/comctl32/comctl32.spec trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlg31.c trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/rsrc.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/hhctrl.ocx/Pt.rc trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc trunk/reactos/dll/win32/itss/chm_lib.h trunk/reactos/dll/win32/jscript/rsrc.rc trunk/reactos/dll/win32/mapi32/version.rc trunk/reactos/dll/win32/msacm32/driver.c trunk/reactos/dll/win32/msacm32/filter.c trunk/reactos/dll/win32/msacm32/format.c trunk/reactos/dll/win32/msacm32/msacm.rc trunk/reactos/dll/win32/msacm32/msacm_Cs.rc trunk/reactos/dll/win32/msacm32/msacm_Da.rc trunk/reactos/dll/win32/msacm32/msacm_De.rc trunk/reactos/dll/win32/msacm32/msacm_En.rc trunk/reactos/dll/win32/msacm32/msacm_Es.rc trunk/reactos/dll/win32/msacm32/msacm_Fr.rc trunk/reactos/dll/win32/msacm32/msacm_Hu.rc trunk/reactos/dll/win32/msacm32/msacm_It.rc trunk/reactos/dll/win32/msacm32/msacm_Ja.rc trunk/reactos/dll/win32/msacm32/msacm_Ko.rc trunk/reactos/dll/win32/msacm32/msacm_Lt.rc trunk/reactos/dll/win32/msacm32/msacm_Nl.rc trunk/reactos/dll/win32/msacm32/msacm_No.rc trunk/reactos/dll/win32/msacm32/msacm_Pl.rc trunk/reactos/dll/win32/msacm32/msacm_Pt.rc trunk/reactos/dll/win32/msacm32/msacm_Ru.rc trunk/reactos/dll/win32/msacm32/msacm_Si.rc trunk/reactos/dll/win32/msacm32/msacm_Sv.rc trunk/reactos/dll/win32/msacm32/msacm_Tr.rc trunk/reactos/dll/win32/msacm32/msacm_Uk.rc trunk/reactos/dll/win32/msacm32/msacm_Zh.rc trunk/reactos/dll/win32/mshtml/Pt.rc trunk/reactos/dll/win32/mshtml/olecmd.c trunk/reactos/dll/win32/mshtml/protocol.c trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msimtf/activeimmapp.c trunk/reactos/dll/win32/oleacc/oleacc_Pt.rc trunk/reactos/dll/win32/pstorec/pstorec.c trunk/reactos/dll/win32/pstorec/pstorec.rbuild trunk/reactos/dll/win32/shdoclc/Hu.rc trunk/reactos/dll/win32/shdoclc/Ko.rc trunk/reactos/dll/win32/shdoclc/Nl.rc trunk/reactos/dll/win32/shdoclc/Pt.rc trunk/reactos/dll/win32/shdoclc/rsrc.rc trunk/reactos/dll/win32/shdocvw/iexplore.c trunk/reactos/dll/win32/shdocvw/navigate.c trunk/reactos/dll/win32/shdocvw/shdocvw.inf trunk/reactos/dll/win32/shdocvw/webbrowser.c trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/dll/win32/snmpapi/main.c trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild trunk/reactos/dll/win32/snmpapi/snmpapi.spec trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/uri.c trunk/reactos/dll/win32/urlmon/urlmon.rbuild trunk/reactos/dll/win32/user32/resources/obm_close.bmp trunk/reactos/dll/win32/user32/resources/obm_mnarrow.bmp trunk/reactos/dll/win32/user32/resources/ocr_appstarting.cur trunk/reactos/dll/win32/user32/resources/ocr_cross.cur trunk/reactos/dll/win32/user32/resources/ocr_dragobject.cur trunk/reactos/dll/win32/user32/resources/ocr_hand.cur trunk/reactos/dll/win32/user32/resources/ocr_help.cur trunk/reactos/dll/win32/user32/resources/ocr_ibeam.cur trunk/reactos/dll/win32/user32/resources/ocr_icon.cur trunk/reactos/dll/win32/user32/resources/ocr_no.cur trunk/reactos/dll/win32/user32/resources/ocr_normal.cur trunk/reactos/dll/win32/user32/resources/ocr_size.cur trunk/reactos/dll/win32/user32/resources/ocr_sizeall.cur trunk/reactos/dll/win32/user32/resources/ocr_sizenesw.cur trunk/reactos/dll/win32/user32/resources/ocr_sizens.cur trunk/reactos/dll/win32/user32/resources/ocr_sizenwse.cur trunk/reactos/dll/win32/user32/resources/ocr_sizewe.cur trunk/reactos/dll/win32/user32/resources/ocr_up.cur trunk/reactos/dll/win32/user32/resources/ocr_wait.cur trunk/reactos/dll/win32/user32/resources/oic_bang.ico trunk/reactos/dll/win32/user32/resources/oic_hand.ico trunk/reactos/dll/win32/user32/resources/oic_note.ico trunk/reactos/dll/win32/user32/resources/oic_ques.ico trunk/reactos/dll/win32/user32/resources/oic_sample.ico trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.rbuild trunk/reactos/dll/win32/usp10/usp10.spec trunk/reactos/dll/win32/usp10/usp10_internal.h trunk/reactos/dll/win32/uxtheme/buffer.c trunk/reactos/dll/win32/windowscodecs/icoformat.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/stream.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild trunk/reactos/dll/win32/wldap32/wldap32.rc trunk/reactos/dll/win32/wldap32/wldap32_Nl.rc trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc trunk/reactos/dll/win32/wldap32/wldap32_Ru.rc trunk/reactos/dll/win32/wldap32/wldap32_Uk.rc trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/dll/win32/wuapi/updates.c trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c trunk/reactos/include/psdk/snmp.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/create… Modified: trunk/reactos/dll/directx/devenum/devenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… Modified: trunk/reactos/dll/directx/devenum/devenum.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… Modified: trunk/reactos/dll/directx/devenum/devenum.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… Modified: trunk/reactos/dll/directx/devenum/devenum_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… Modified: trunk/reactos/dll/directx/devenum/devenum_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… Modified: trunk/reactos/dll/directx/devenum/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/factor… Modified: trunk/reactos/dll/directx/devenum/mediacatenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/mediac… Modified: trunk/reactos/dll/directx/devenum/parsedisplayname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/parsed… Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Added: trunk/reactos/dll/win32/comctl32/comctl_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Da… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Fr… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Hu… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_It… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ja… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Nl… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ru… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Uk… Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/filedlg31.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc… Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Added: trunk/reactos/dll/win32/cryptui/cryptui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/hhctrl.ocx/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Pt.rc… Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… Modified: trunk/reactos/dll/win32/itss/chm_lib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/chm_lib.h?r… Added: trunk/reactos/dll/win32/jscript/jscript_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Modified: trunk/reactos/dll/win32/jscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/rsrc.rc?… Added: trunk/reactos/dll/win32/mapi32/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/No.rc?rev… Modified: trunk/reactos/dll/win32/mapi32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/version.r… Removed: trunk/reactos/dll/win32/msacm32/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/Makefile… Modified: trunk/reactos/dll/win32/msacm32/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/driver.c… Modified: trunk/reactos/dll/win32/msacm32/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/filter.c… Modified: trunk/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/format.c… Modified: trunk/reactos/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm.rc… Modified: trunk/reactos/dll/win32/msacm32/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Cs… Modified: trunk/reactos/dll/win32/msacm32/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Da… Modified: trunk/reactos/dll/win32/msacm32/msacm_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_De… Modified: trunk/reactos/dll/win32/msacm32/msacm_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_En… Modified: trunk/reactos/dll/win32/msacm32/msacm_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Es… Modified: trunk/reactos/dll/win32/msacm32/msacm_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Fr… Modified: trunk/reactos/dll/win32/msacm32/msacm_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Hu… Modified: trunk/reactos/dll/win32/msacm32/msacm_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_It… Modified: trunk/reactos/dll/win32/msacm32/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Ja… Modified: trunk/reactos/dll/win32/msacm32/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Ko… Modified: trunk/reactos/dll/win32/msacm32/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Lt… Modified: trunk/reactos/dll/win32/msacm32/msacm_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Nl… Modified: trunk/reactos/dll/win32/msacm32/msacm_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_No… Modified: trunk/reactos/dll/win32/msacm32/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Pl… Modified: trunk/reactos/dll/win32/msacm32/msacm_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Pt… Modified: trunk/reactos/dll/win32/msacm32/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Ru… Modified: trunk/reactos/dll/win32/msacm32/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Si… Modified: trunk/reactos/dll/win32/msacm32/msacm_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Sv… Modified: trunk/reactos/dll/win32/msacm32/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Tr… Modified: trunk/reactos/dll/win32/msacm32/msacm_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Uk… Modified: trunk/reactos/dll/win32/msacm32/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Zh… Modified: trunk/reactos/dll/win32/mshtml/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Pt.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/olecmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olecmd.c?… Modified: trunk/reactos/dll/win32/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/protocol.… Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/activeimm… Removed: trunk/reactos/dll/win32/odbc32/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/Makefile.… Modified: trunk/reactos/dll/win32/oleacc/oleacc_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_Pt… Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… Modified: trunk/reactos/dll/win32/pstorec/pstorec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… Removed: trunk/reactos/dll/win32/pstorec/pstorec_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec_… Modified: trunk/reactos/dll/win32/shdoclc/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Hu.rc?re… Added: trunk/reactos/dll/win32/shdoclc/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/It.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Ja.rc?re… Modified: trunk/reactos/dll/win32/shdoclc/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Ko.rc?re… Modified: trunk/reactos/dll/win32/shdoclc/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Nl.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Pl.rc?re… Modified: trunk/reactos/dll/win32/shdoclc/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Pt.rc?re… Modified: trunk/reactos/dll/win32/shdoclc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/rsrc.rc?… Modified: trunk/reactos/dll/win32/shdocvw/iexplore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/iexplore… Modified: trunk/reactos/dll/win32/shdocvw/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/navigate… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/webbrows… Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… Removed: trunk/reactos/dll/win32/snmpapi/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/debug.h?… Modified: trunk/reactos/dll/win32/snmpapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/main.c?r… Removed: trunk/reactos/dll/win32/snmpapi/snmpapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… Removed: trunk/reactos/dll/win32/twain_32/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/Makefil… Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… Modified: trunk/reactos/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/uri.c?rev… Modified: trunk/reactos/dll/win32/urlmon/urlmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.rb… Modified: trunk/reactos/dll/win32/user32/resources/obm_close.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/obm_mnarrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_appstarting.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_cross.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_dragobject.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_hand.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_help.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_ibeam.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_icon.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_no.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_normal.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_size.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizeall.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizenesw.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizens.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizenwse.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizewe.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_up.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/ocr_wait.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/oic_bang.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/oic_hand.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/oic_note.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/oic_ques.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/user32/resources/oic_sample.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… Added: trunk/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?r… Added: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… Added: trunk/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?… Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… Modified: trunk/reactos/dll/win32/usp10/usp10.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.rbui… Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec… Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… Modified: trunk/reactos/dll/win32/uxtheme/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/buffer.c… Added: trunk/reactos/dll/win32/windowscodecs/fliprotate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/fl… Modified: trunk/reactos/dll/win32/windowscodecs/icoformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/im… Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/in… Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… Modified: trunk/reactos/dll/win32/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/st… Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ti… Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… Modified: trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… Added: trunk/reactos/dll/win32/wldap32/wldap32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… Added: trunk/reactos/dll/win32/wldap32/wldap32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… Modified: trunk/reactos/dll/win32/wldap32/wldap32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… Modified: trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… Modified: trunk/reactos/dll/win32/wldap32/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… Modified: trunk/reactos/dll/win32/wldap32/wldap32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… Modified: trunk/reactos/dll/win32/wuapi/updates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/updates.c?… Modified: trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… Modified: trunk/reactos/include/psdk/snmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/snmp.h?rev=47…

1 0

[spetreolle] 47960: sysreg doesn't like rain of SEMI-STUB debug
by spetreolle＠svn.reactos.org 06 Jul '10

06 Jul '10

Author: spetreolle Date: Tue Jul 6 20:01:55 2010 New Revision: 47960 URL: http://svn.reactos.org/svn/reactos?rev=47960&view=rev Log: sysreg doesn't like rain of SEMI-STUB debug Modified: trunk/reactos/dll/win32/atl/atl_main.c Modified: trunk/reactos/dll/win32/atl/atl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_main.c [iso-8859-1] Tue Jul 6 20:01:55 2010 @@ -60,7 +60,7 @@ INT i; UINT size; - FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); + //FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); size = pM->cbSize; switch (size)

1 0

[pschweitzer] 47959: Fix a FIXME in fastfat driver which also fixes a BSOD in kernel32 path winetest
by pschweitzer＠svn.reactos.org 06 Jul '10

06 Jul '10

Author: pschweitzer Date: Tue Jul 6 18:39:09 2010 New Revision: 47959 URL: http://svn.reactos.org/svn/reactos?rev=47959&view=rev Log: Fix a FIXME in fastfat driver which also fixes a BSOD in kernel32 path winetest Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Tue Jul 6 18:39:09 2010 @@ -469,8 +469,12 @@ CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); - /* FIXME: check status */ - vfatMakeFCBFromDirEntry(DeviceExt, ParentFcb, &DirContext, Fcb); + Status = vfatMakeFCBFromDirEntry(DeviceExt, ParentFcb, &DirContext, Fcb); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Buffer, TAG_VFAT); + return Status; + } DPRINT("new : entry=%11.11s\n", (*Fcb)->entry.Fat.Filename); DPRINT("new : entry=%11.11s\n", DirContext.DirEntry.Fat.Filename);

1 0

[mjmartin] 47958: - Implement DeviceHandleToUsbDevice and remove IsHandleValid. - Add call to DeviceHandleToUsbDevice for all Direct Call functions that pass DeviceHandle. - Stop the processing of Asynchronous List after the Control Request has been processed by controller. - Misc changes.
by mjmartin＠svn.reactos.org 06 Jul '10

06 Jul '10

Author: mjmartin Date: Tue Jul 6 12:02:33 2010 New Revision: 47958 URL: http://svn.reactos.org/svn/reactos?rev=47958&view=rev Log: - Implement DeviceHandleToUsbDevice and remove IsHandleValid. - Add call to DeviceHandleToUsbDevice for all Direct Call functions that pass DeviceHandle. - Stop the processing of Asynchronous List after the Control Request has been processed by controller. - Misc changes. Modified: trunk/reactos/drivers/usb/usbehci/common.c trunk/reactos/drivers/usb/usbehci/misc.c trunk/reactos/drivers/usb/usbehci/pdo.c trunk/reactos/drivers/usb/usbehci/urbreq.c trunk/reactos/drivers/usb/usbehci/usbehci.h trunk/reactos/drivers/usb/usbehci/usbehci.rbuild trunk/reactos/drivers/usb/usbehci/usbiffn.c Modified: trunk/reactos/drivers/usb/usbehci/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/common… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/common.c [iso-8859-1] Tue Jul 6 12:02:33 2010 @@ -4,7 +4,7 @@ * FILE: drivers/usb/usbehci/common.c * PURPOSE: Common operations in FDO/PDO. * PROGRAMMERS: - * Michael Martin + * Michael Martin (mjmartin(a)reactos.org) */ #define INITGUID @@ -135,7 +135,7 @@ if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) DestMaxLength += sizeof(UNICODE_NULL); - DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); + DestinationString->Buffer = ExAllocatePoolWithTag(NonPagedPool, DestMaxLength, USB_POOL_TAG); if (DestinationString->Buffer == NULL) return STATUS_NO_MEMORY; Modified: trunk/reactos/drivers/usb/usbehci/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/misc.c [iso-8859-1] Tue Jul 6 12:02:33 2010 @@ -8,6 +8,8 @@ */ #include "usbehci.h" +#include <hubbusif.h> +#include <usbbusif.h> /* Get SymblicName from Parameters in Registry Key @@ -121,3 +123,14 @@ return ObjectName; } +PUSB_DEVICE DeviceHandleToUsbDevice(PPDO_DEVICE_EXTENSION PdoDeviceExtension, PUSB_DEVICE_HANDLE DeviceHandle) +{ + LONG i; + + for (i=0; i<127; i++) + { + if (PdoDeviceExtension->UsbDevices[i] == (PUSB_DEVICE)DeviceHandle) + return (PUSB_DEVICE)DeviceHandle; + } + return NULL; +} Modified: trunk/reactos/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Tue Jul 6 12:02:33 2010 @@ -446,7 +446,6 @@ else { Status = IoSetDeviceInterfaceState(&InterfaceSymLinkName, TRUE); - DPRINT1("Set interface state %x\n", Status); if (!NT_SUCCESS(Status)) ASSERT(FALSE); } Modified: trunk/reactos/drivers/usb/usbehci/urbreq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/urbreq… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] Tue Jul 6 12:02:33 2010 @@ -82,7 +82,10 @@ (*CtrlTD2)->NextPointer = TERMINATE_POINTER; (*CtrlTD2)->AlternateNextPointer = TERMINATE_POINTER; - (*CtrlTD2)->BufferPointer[0] = (ULONG)MmGetPhysicalAddress((PVOID) (*CtrlData)).LowPart; + if (Size == 0) + (*CtrlTD2)->BufferPointer[0] = 0; + else + (*CtrlTD2)->BufferPointer[0] = (ULONG)MmGetPhysicalAddress((PVOID) (*CtrlData)).LowPart; (*CtrlTD2)->Token.Bits.DataToggle = TRUE; (*CtrlTD2)->Token.Bits.InterruptOnComplete = TRUE; (*CtrlTD2)->Token.Bits.TotalBytesToTransfer = Size; @@ -98,6 +101,7 @@ (*CtrlTD3)->Token.Bits.Active = TRUE; (*CtrlTD3)->Token.Bits.PIDCode = PID_CODE_OUT_TOKEN; (*CtrlTD3)->Token.Bits.InterruptOnComplete = TRUE; + (*CtrlTD3)->Token.Bits.TotalBytesToTransfer = 0; (*CtrlTD3)->Token.Bits.DataToggle = TRUE; (*CtrlTD3)->Token.Bits.ErrorCounter = 0x03; (*CtrlTD2)->NextPointer = (ULONG) MmGetPhysicalAddress((PVOID)(*CtrlTD3)).LowPart; @@ -185,11 +189,14 @@ for (;;) { - KeStallExecutionProcessor(10); + KeStallExecutionProcessor(100); DPRINT("Waiting for completion!\n"); if (DeviceExtension->AsyncComplete == TRUE) break; } + + UsbCmd->Run = FALSE; + WRITE_REGISTER_ULONG((PULONG)(Base + EHCI_USBCMD), tmp); if (CtrlSetup->bmRequestType._BM.Dir == BMREQUEST_DEVICE_TO_HOST) { Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Tue Jul 6 12:02:33 2010 @@ -419,14 +419,6 @@ FAST_MUTEX ListLock; } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; -typedef struct _WORKITEM_DATA -{ - PIO_WORKITEM IoWorkItem; - PPDO_DEVICE_EXTENSION PdoDeviceExtension; - PDEVICE_OBJECT PortDeviceObject; -} WORKITEM_DATA, *PWORKITEM_DATA; - - VOID NTAPI UrbWorkerThread(PVOID Context); @@ -478,5 +470,5 @@ VOID URBRequestCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp); -VOID NTAPI -DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context); +PUSB_DEVICE +DeviceHandleToUsbDevice(PPDO_DEVICE_EXTENSION PdoDeviceExtension, PUSB_DEVICE_HANDLE DeviceHandle); Modified: trunk/reactos/drivers/usb/usbehci/usbehci.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.rbuild [iso-8859-1] Tue Jul 6 12:02:33 2010 @@ -11,4 +11,5 @@ <file>irp.c</file> <file>usbiffn.c</file> <file>urbreq.c</file> + <file>usbehci.rc</file> </module> Modified: trunk/reactos/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] Tue Jul 6 12:02:33 2010 @@ -38,27 +38,6 @@ return UsbDevicePointer; } -BOOLEAN -IsHandleValid(PVOID BusContext, - PUSB_DEVICE_HANDLE DeviceHandle) -{ - PPDO_DEVICE_EXTENSION PdoDeviceExtension; - LONG i; - - PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) BusContext; - - if (!DeviceHandle) - return FALSE; - - for (i = 0; i < 128; i++) - { - if (PdoDeviceExtension->UsbDevices[i] == DeviceHandle) - return TRUE; - } - - return FALSE; -} - VOID USB_BUSIFFN InterfaceReference(PVOID BusContext) @@ -86,9 +65,18 @@ PUSB_DEVICE UsbDevice; LONG i = 0; PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; - DPRINT1("CreateUsbDevice: HubDeviceHandle %x, PortStatus %x, PortNumber %x\n", HubDeviceHandle, PortStatus, PortNumber); + DPRINT("CreateUsbDevice: HubDeviceHandle %x, PortStatus %x, PortNumber %x\n", HubDeviceHandle, PortStatus, PortNumber); + + if (PdoDeviceExtension->UsbDevices[0] != HubDeviceHandle) + { + DPRINT1("Not a valid HubDeviceHandle\n"); + return STATUS_DEVICE_NOT_CONNECTED; + } UsbDevice = InternalCreateUsbDevice(PdoDeviceExtension->ChildDeviceCount, PortNumber, HubDeviceHandle, FALSE); + + if (!UsbDevice) + return STATUS_INSUFFICIENT_RESOURCES; /* Add it to the list */ while (TRUE) @@ -131,7 +119,14 @@ DPRINT1("InitializeUsbDevice called, device %x\n", DeviceHandle); PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; - UsbDevice = (PUSB_DEVICE) DeviceHandle; + + UsbDevice = DeviceHandleToUsbDevice(BusContext, DeviceHandle); + + if (!UsbDevice) + { + DPRINT1("Invalid DeviceHandle or device not connected\n"); + return STATUS_DEVICE_NOT_CONNECTED; + } Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, USB_POOL_TAG); @@ -153,7 +148,7 @@ CtrlSetup.wLength = 0; DPRINT1("Setting Address to %x\n", UsbDevice->Address); - ResultOk = ExecuteControlRequest(FdoDeviceExtension, &CtrlSetup, 0, 0, NULL, 0); + ResultOk = ExecuteControlRequest(FdoDeviceExtension, &CtrlSetup, 0, UsbDevice->Port, NULL, 0); /* Get the Device Descriptor */ CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; @@ -177,7 +172,10 @@ DPRINT1("bNumDescriptors %x\n", UsbDevice->DeviceDescriptor.bNumConfigurations); if (UsbDevice->DeviceDescriptor.bNumConfigurations == 0) + { + DPRINT1("No Configurations. That cant be good!\n"); return STATUS_DEVICE_DATA_ERROR; + } UsbDevice->Configs = ExAllocatePoolWithTag(NonPagedPool, sizeof(PVOID) * UsbDevice->DeviceDescriptor.bNumConfigurations, @@ -256,8 +254,14 @@ PUSB_DEVICE UsbDevice; DPRINT1("GetUsbDescriptor %x, %x, %x, %x\n", DeviceDescriptorBuffer, *DeviceDescriptorBufferLength, ConfigDescriptorBuffer, *ConfigDescriptorBufferLength); - UsbDevice = (PUSB_DEVICE) DeviceHandle; - DPRINT1("DeviceHandle %x\n", UsbDevice); + UsbDevice = DeviceHandleToUsbDevice(BusContext, DeviceHandle); + + if (!UsbDevice) + { + DPRINT1("Invalid DeviceHandle or device not connected\n"); + return STATUS_DEVICE_NOT_CONNECTED; + } + if ((DeviceDescriptorBuffer) && (DeviceDescriptorBufferLength)) { RtlCopyMemory(DeviceDescriptorBuffer, &UsbDevice->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); @@ -284,13 +288,13 @@ PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; - /* FIXME: Implement DeviceHandleToUsbDevice to validate handles */ - //UsbDevice = DeviceHandleToUsbDevice(PdoDeviceExtension, DeviceHandle); - - UsbDevice = (PUSB_DEVICE) DeviceHandle; - - if (!UsbDevice) + UsbDevice = DeviceHandleToUsbDevice(BusContext, DeviceHandle); + + if (!UsbDevice) + { + DPRINT1("Invalid DeviceHandle or device not connected\n"); return STATUS_DEVICE_NOT_CONNECTED; + } switch (Flags) { @@ -320,11 +324,11 @@ /* DeConfig Device */ break; case USBD_KEEP_DEVICE_DATA: - DPRINT("USBD_KEEP_DEVICE_DATA Not implemented!\n"); + DPRINT1("USBD_KEEP_DEVICE_DATA Not implemented!\n"); break; case USBD_MARK_DEVICE_BUSY: - DPRINT("USBD_MARK_DEVICE_BUSY Not implemented!\n"); + DPRINT1("USBD_MARK_DEVICE_BUSY Not implemented!\n"); break; default: DPRINT1("Unknown Remove Flags %x\n", Flags); @@ -357,17 +361,18 @@ PULONG LengthReturned) { PUSB_DEVICE_INFORMATION_0 DeviceInfo = DeviceInformationBuffer; - PUSB_DEVICE UsbDevice = (PUSB_DEVICE) DeviceHandle; + PUSB_DEVICE UsbDevice; ULONG SizeNeeded; LONG i; DPRINT1("QueryDeviceInformation (%x, %x, %x, %d, %x\n", BusContext, DeviceHandle, DeviceInformationBuffer, DeviceInformationBufferLength, LengthReturned); - /* Search for a valid usb device in this BusContext */ - if (!IsHandleValid(BusContext, DeviceHandle)) - { - DPRINT1("Not a valid DeviceHandle\n"); - return STATUS_INVALID_PARAMETER; + UsbDevice = DeviceHandleToUsbDevice(BusContext, DeviceHandle); + + if (!UsbDevice) + { + DPRINT1("Invalid DeviceHandle or device not connected\n"); + return STATUS_DEVICE_NOT_CONNECTED; } SizeNeeded = FIELD_OFFSET(USB_DEVICE_INFORMATION_0, PipeList[UsbDevice->ActiveInterface->InterfaceDescriptor.bNumEndpoints]); @@ -505,7 +510,17 @@ USB_BUSIFFN GetDeviceBusContext(PVOID HubBusContext, PVOID DeviceHandle) { + PUSB_DEVICE UsbDevice; + DPRINT1("GetDeviceBusContext called\n"); + UsbDevice = DeviceHandleToUsbDevice(HubBusContext, DeviceHandle); + + if (!UsbDevice) + { + DPRINT1("Invalid DeviceHandle or device not connected\n"); + return NULL; + } + return NULL; } @@ -549,6 +564,14 @@ USB_BUSIFFN FlushTransfers(PVOID BusContext, PVOID DeviceHandle) { + PUSB_DEVICE UsbDevice; + UsbDevice = DeviceHandleToUsbDevice(BusContext, DeviceHandle); + + if (!UsbDevice) + { + DPRINT1("Invalid DeviceHandle or device not connected\n"); + } + DPRINT1("FlushTransfers\n"); } @@ -611,5 +634,5 @@ EnumLogEntry(PVOID BusContext, ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2) { DPRINT1("EnumLogEntry called\n"); - return STATUS_NOT_SUPPORTED; -} + return STATUS_SUCCESS; +}

1 0

[dreimer] 47957: Update package database to contain all winetests. This makes it possible to even use them in testman.
by dreimer＠svn.reactos.org 06 Jul '10

06 Jul '10

Author: dreimer Date: Tue Jul 6 10:31:24 2010 New Revision: 47957 URL: http://svn.reactos.org/svn/reactos?rev=47957&view=rev Log: Update package database to contain all winetests. This makes it possible to even use them in testman. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Jul 6 10:31:24 2010 @@ -762,46 +762,77 @@ modules\rostests\tests\pseh2\pseh2_test.exe 7 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional +modules\rostests\winetests\amstream\amstream_winetest.exe 7 optional +modules\rostests\winetests\atl\atl_winetest.exe 7 optional +modules\rostests\winetests\avifil32\avifil32_winetest.exe 7 optional modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional modules\rostests\winetests\comcat\comcat_winetest.exe 7 optional modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional modules\rostests\winetests\comdlg32\comdlg32_winetest.exe 7 optional +modules\rostests\winetests\credui\credui_winetest.exe 7 optional modules\rostests\winetests\crypt32\crypt32_winetest.exe 7 optional modules\rostests\winetests\cryptnet\cryptnet_winetest.exe 7 optional +modules\rostests\winetests\cryptui\cryptui_winetest.exe 7 optional +modules\rostests\winetests\dnsapi\dnsapi_winetest.exe 7 optional modules\rostests\winetests\dsound\dsound_winetest.exe 7 optional +modules\rostests\winetests\fusion\fusion_winetest.exe 7 optional modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional +modules\rostests\winetests\imm32\imm32_winetest.exe 7 optional +modules\rostests\winetests\inetcomm\inetcomm_winetest.exe 7 optional +modules\rostests\winetests\inetmib1\inetmib1_winetest.exe 7 optional modules\rostests\winetests\iphlpapi\iphlpapi_winetest.exe 7 optional +modules\rostests\winetests\itss\itss_winetest.exe 7 optional modules\rostests\winetests\jscript\jscript_winetest.exe 7 optional modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional +modules\rostests\winetests\localspl\localspl_winetest.exe 7 optional +modules\rostests\winetests\localui\localui_winetest.exe 7 optional modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional modules\rostests\winetests\mapi32\mapi32_winetest.exe 7 optional modules\rostests\winetests\mlang\mlang_winetest.exe 7 optional +modules\rostests\winetests\msacm32\msacm32_winetest.exe 7 optional +modules\rostests\winetests\mscms\mscms_winetest.exe 7 optional +modules\rostests\winetests\msctf\msctf_winetest.exe 7 optional modules\rostests\winetests\mshtml\mshtml_winetest.exe 7 optional modules\rostests\winetests\msi\msi_winetest.exe 7 optional modules\rostests\winetests\mstask\mstask_winetest.exe 7 optional modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional +modules\rostests\winetests\msvcrtd\msvcrtd_winetest.exe 7 optional +modules\rostests\winetests\msvfw32\msvfw32_winetest.exe 7 optional modules\rostests\winetests\msxml3\msxml3_winetest.exe 7 optional modules\rostests\winetests\netapi32\netapi32_winetest.exe 7 optional modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional +modules\rostests\winetests\ntdsapi\ntdsapi_winetest.exe 7 optional +modules\rostests\winetests\ntprint\ntprint_winetest.exe 7 optional modules\rostests\winetests\odbccp32\odbccp32_winetest.exe 7 optional modules\rostests\winetests\ole32\ole32_winetest.exe 7 optional +modules\rostests\winetests\oleacc\oleacc_winetest.exe 7 optional modules\rostests\winetests\oleaut32\oleaut32_winetest.exe 7 optional +modules\rostests\winetests\opengl32\opengl32_winetest.exe 7 optional +modules\rostests\winetests\pdh\pdh_winetest.exe 7 optional modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional +modules\rostests\winetests\qmgr\qmgr_winetest.exe 7 optional +modules\rostests\winetests\quartz\quartz_winetest.exe 7 optional +modules\rostests\winetests\rasapi32\rasapi32_winetest.exe 7 optional modules\rostests\winetests\riched20\riched20_winetest.exe 7 optional +modules\rostests\winetests\riched32\riched32_winetest.exe 7 optional modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe 7 optional modules\rostests\winetests\rsabase\rsabase_winetest.exe 7 optional modules\rostests\winetests\rsaenh\rsaenh_winetest.exe 7 optional modules\rostests\winetests\schannel\schannel_winetest.exe 7 optional modules\rostests\winetests\secur32\secur32_winetest.exe 7 optional +modules\rostests\winetests\serialui\serialui_winetest.exe 7 optional modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional modules\rostests\winetests\shdocvw\shdocvw_winetest.exe 7 optional modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional +modules\rostests\winetests\snmpapi\snmpapi_winetest.exe 7 optional +modules\rostests\winetests\spoolss\spoolss_winetest.exe 7 optional +modules\rostests\winetests\twain_32\twain_32_winetest.exe 7 optional modules\rostests\winetests\urlmon\urlmon_winetest.exe 7 optional modules\rostests\winetests\user32\user32_winetest.exe 7 optional modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional @@ -812,6 +843,7 @@ modules\rostests\winetests\winmm\winmm_winetest.exe 7 optional modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional modules\rostests\winetests\wlanapi\wlanapi_winetest.exe 7 optional +modules\rostests\winetests\wldap32\wldap32_winetest.exe 7 optional modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional modules\rostests\winetests\xmllite\xmllite_winetest.exe 7 optional

1 0

[dreimer] 47956: Add amstream, atl and avifil32 winetests. Sync opengl32, powrprof and fix quartz's testlist
by dreimer＠svn.reactos.org 06 Jul '10

06 Jul '10

Author: dreimer Date: Tue Jul 6 09:44:43 2010 New Revision: 47956 URL: http://svn.reactos.org/svn/reactos?rev=47956&view=rev Log: Add amstream, atl and avifil32 winetests. Sync opengl32, powrprof and fix quartz's testlist Added: trunk/rostests/winetests/amstream/ trunk/rostests/winetests/amstream/amstream.c (with props) trunk/rostests/winetests/amstream/amstream.rbuild (with props) trunk/rostests/winetests/amstream/testlist.c (with props) trunk/rostests/winetests/atl/ trunk/rostests/winetests/atl/atl.rbuild (with props) trunk/rostests/winetests/atl/atl_ax.c (with props) trunk/rostests/winetests/atl/module.c (with props) trunk/rostests/winetests/atl/testlist.c (with props) trunk/rostests/winetests/avifil32/ trunk/rostests/winetests/avifil32/api.c (with props) trunk/rostests/winetests/avifil32/avifil32.rbuild (with props) trunk/rostests/winetests/avifil32/testlist.c (with props) Modified: trunk/rostests/winetests/directory.rbuild trunk/rostests/winetests/opengl32/opengl.c trunk/rostests/winetests/powrprof/pwrprof.c trunk/rostests/winetests/quartz/testlist.c Added: trunk/rostests/winetests/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/amstre… ============================================================================== --- trunk/rostests/winetests/amstream/amstream.c (added) +++ trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,198 @@ +/* + * Unit tests for MultiMedia Stream functions + * + * Copyright (C) 2009 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#define COBJMACROS + +#include "wine/test.h" +#include "initguid.h" +#include "amstream.h" + +#define FILE_LEN 9 +static const char fileA[FILE_LEN] = "test.avi"; + +IAMMultiMediaStream* pams; +IDirectDraw7* pdd7 = NULL; +IDirectDrawSurface7* pdds7 = NULL; + +static int create_ammultimediastream(void) +{ + return S_OK == CoCreateInstance( + &CLSID_AMMultiMediaStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMultiMediaStream, (LPVOID*)&pams); +} + +static void release_ammultimediastream(void) +{ + IAMMultiMediaStream_Release(pams); +} + +static int create_directdraw(void) +{ + HRESULT hr; + IDirectDraw* pdd = NULL; + DDSURFACEDESC2 ddsd; + + hr = DirectDrawCreate(NULL, &pdd, NULL); + ok(hr==DD_OK, "DirectDrawCreate returned: %x\n", hr); + if (hr != DD_OK) + goto error; + + hr = IDirectDraw_QueryInterface(pdd, &IID_IDirectDraw7, (LPVOID*)&pdd7); + ok(hr==DD_OK, "QueryInterface returned: %x\n", hr); + if (hr != DD_OK) goto error; + + hr = IDirectDraw7_SetCooperativeLevel(pdd7, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr==DD_OK, "SetCooperativeLevel returned: %x\n", hr); + + ZeroMemory(&ddsd, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw7_CreateSurface(pdd7, &ddsd, &pdds7, NULL); + ok(hr==DD_OK, "CreateSurface returned: %x\n", hr); + + return TRUE; + +error: + if (pdds7) + IDirectDrawSurface7_Release(pdds7); + if (pdd7) + IDirectDraw7_Release(pdd7); + if (pdd) + IDirectDraw_Release(pdd); + + return FALSE; +} + +static void release_directdraw(void) +{ + IDirectDrawSurface7_Release(pdds7); + IDirectDraw7_Release(pdd7); +} + +static void test_openfile(void) +{ + HANDLE h; + HRESULT hr; + WCHAR fileW[FILE_LEN]; + IGraphBuilder* pgraph; + + if (!create_ammultimediastream()) + return; + + h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + if (h == INVALID_HANDLE_VALUE) { + release_ammultimediastream(); + return; + } + + MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); + + hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); + ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); + ok(pgraph==NULL, "Filtergraph should not be created yet\n"); + + if (pgraph) + IGraphBuilder_Release(pgraph); + + hr = IAMMultiMediaStream_OpenFile(pams, fileW, 0); + ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); + ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); + ok(pgraph!=NULL, "Filtergraph should be created\n"); + + if (pgraph) + IGraphBuilder_Release(pgraph); + + release_ammultimediastream(); +} + +static void renderfile(const char * fileA) +{ + HRESULT hr; + WCHAR fileW[FILE_LEN]; + IMediaStream *pvidstream = NULL; + IDirectDrawMediaStream *pddstream = NULL; + IDirectDrawStreamSample *pddsample = NULL; + + if (!create_directdraw()) + return; + + MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); + + hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); + ok(hr==S_OK, "IAMMultiMediaStream_Initialize returned: %x\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(pams, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); + ok(hr==S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); + ok(hr==S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + + hr = IAMMultiMediaStream_OpenFile(pams, fileW, 0); + ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); + + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &pvidstream); + ok(hr==S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + if (FAILED(hr)) goto error; + + hr = IMediaStream_QueryInterface(pvidstream, &IID_IDirectDrawMediaStream, (LPVOID*)&pddstream); + ok(hr==S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + if (FAILED(hr)) goto error; + + hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); + todo_wine ok(hr==S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + +error: + if (pddsample) + IDirectDrawMediaSample_Release(pddsample); + if (pddstream) + IDirectDrawMediaStream_Release(pddstream); + if (pvidstream) + IMediaStream_Release(pvidstream); + + release_directdraw(); +} + +static void test_render(void) +{ + HANDLE h; + + if (!create_ammultimediastream()) + return; + + h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + if (h != INVALID_HANDLE_VALUE) { + CloseHandle(h); + renderfile(fileA); + } + + release_ammultimediastream(); +} + +START_TEST(amstream) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + test_openfile(); + test_render(); + CoUninitialize(); +} Propchange: trunk/rostests/winetests/amstream/amstream.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/amstream/amstream.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/amstre… ============================================================================== --- trunk/rostests/winetests/amstream/amstream.rbuild (added) +++ trunk/rostests/winetests/amstream/amstream.rbuild [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="amstream_winetest" type="win32cui" installbase="bin" installname="amstream_winetest.exe" allowwarnings="true"> + <include base="amstream_winetest">.</include> + <library>wine</library> + <library>ole32</library> + <library>user32</library> + <library>uuid</library> + <library>ntdll</library> + <library>ddraw</library> + <file>amstream.c</file> + <file>testlist.c</file> +</module> +</group> Propchange: trunk/rostests/winetests/amstream/amstream.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/amstream/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/testli… ============================================================================== --- trunk/rostests/winetests/amstream/testlist.c (added) +++ trunk/rostests/winetests/amstream/testlist.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,15 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_amstream(void); + +const struct test winetest_testlist[] = +{ + { "amstream", func_amstream }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/amstream/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/atl/atl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/atl.rbuild?… ============================================================================== --- trunk/rostests/winetests/atl/atl.rbuild (added) +++ trunk/rostests/winetests/atl/atl.rbuild [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="atl_winetest" type="win32cui" installbase="bin" installname="atl_winetest.exe" allowwarnings="true"> + <include base="atl_winetest">.</include> + <library>wine</library> + <library>ole32</library> + <library>user32</library> + <library>uuid</library> + <library>ntdll</library> + <library>atl</library> + <file>atl_ax.c</file> + <file>module.c</file> + <file>testlist.c</file> +</module> +</group> Propchange: trunk/rostests/winetests/atl/atl.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/atl_ax.c?re… ============================================================================== --- trunk/rostests/winetests/atl/atl_ax.c (added) +++ trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,122 @@ +/* + * Unit tests for Active Template Library ActiveX functions + * + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include <wine/test.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> +#include <winnls.h> +#include <winerror.h> +#include <winnt.h> +#include <wtypes.h> +#include <olectl.h> +#include <ocidl.h> +#include <exdisp.h> + +HRESULT WINAPI AtlAxAttachControl(IUnknown *, HWND, IUnknown **); + +static ATOM register_class(void) +{ + WNDCLASSA wndclassA; + + wndclassA.style = 0; + wndclassA.lpfnWndProc = DefWindowProc; + wndclassA.cbClsExtra = 0; + wndclassA.cbWndExtra = 0; + wndclassA.hInstance = GetModuleHandleA(NULL); + wndclassA.hIcon = NULL; + wndclassA.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); + wndclassA.lpszMenuName = NULL; + wndclassA.lpszClassName = "WineAtlTestClass"; + + return RegisterClassA(&wndclassA); +} + +static void test_AtlAxAttachControl(void) +{ + HWND hwnd = CreateWindowA("WineAtlTestClass", "Wine ATL Test Window", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, NULL, NULL, NULL, NULL); + HRESULT hr; + IUnknown *pObj, *pContainer; + + hr = AtlAxAttachControl(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + + pContainer = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(NULL, NULL, &pContainer); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + ok(pContainer == (IUnknown *)0xdeadbeef, + "Expected the output container pointer to be untouched, got %p\n", pContainer); + + hr = AtlAxAttachControl(NULL, hwnd, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + + hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IOleObject, (void **)&pObj); + ok(hr == S_OK, "Expected CoCreateInstance to return S_OK, got 0x%08x\n", hr); + + if (FAILED(hr)) + { + skip("Couldn't obtain a test IOleObject instance\n"); + return; + } + + hr = AtlAxAttachControl(pObj, NULL, NULL); + todo_wine + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + + pContainer = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(pObj, NULL, &pContainer); + todo_wine + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + ok(pContainer != (IUnknown *)0xdeadbeef && + pContainer != NULL, + "Expected the output container pointer to be initialized to non-NULL, got %p\n", pContainer); + + if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL) + IUnknown_Release(pContainer); + + hr = AtlAxAttachControl(pObj, hwnd, NULL); + ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); + + IUnknown_Release(pObj); + + DestroyWindow(hwnd); +} + +START_TEST(atl_ax) +{ + if (!register_class()) + return; + + CoInitialize(NULL); + + test_AtlAxAttachControl(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/atl/atl_ax.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/atl/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/module.c?re… ============================================================================== --- trunk/rostests/winetests/atl/module.c (added) +++ trunk/rostests/winetests/atl/module.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,104 @@ +/* + * ATL test program + * + * Copyright 2010 Marcus Meissner + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include <wine/test.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> +#include <winnls.h> +#include <winerror.h> +#include <winnt.h> +#include <initguid.h> +#include <wtypes.h> +#include <olectl.h> +#include <ocidl.h> + +struct _ATL_OBJMAP_ENTRYW; +struct _AtlCreateWndData; +struct _ATL_TERMFUNC_ELEM; + +struct _ATL_MODULEW +{ + UINT cbSize; + HINSTANCE m_hInst; + HINSTANCE m_hInstResource; + HINSTANCE m_hInstTypeLib; + struct _ATL_OBJMAP_ENTRYW* m_pObjMap; + LONG m_nLockCnt; + HANDLE m_hHeap; + union + { + CRITICAL_SECTION m_csTypeInfoHolder; + CRITICAL_SECTION m_csStaticDataInit; + } u; + CRITICAL_SECTION m_csWindowCreate; + CRITICAL_SECTION m_csObjMap; + + DWORD dwAtlBuildVer; + struct _AtlCreateWndData* m_pCreateWndList; + BOOL m_bDestroyHeap; + GUID* pguidVer; + DWORD m_dwHeaps; + HANDLE* m_phHeaps; + int m_nHeap; + struct _ATL_TERMFUNC_ELEM* m_pTermFuncs; +}; + +HRESULT WINAPI AtlModuleInit(struct _ATL_MODULEW* pM, struct _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); + +#define MAXSIZE 512 +static void test_StructSize(void) +{ + struct _ATL_MODULEW *tst; + HRESULT hres; + int i; + + tst = HeapAlloc (GetProcessHeap(),HEAP_ZERO_MEMORY,MAXSIZE); + + for (i=0;i<MAXSIZE;i++) { + tst->cbSize = i; + hres = AtlModuleInit(tst, NULL, NULL); + + switch (i) { + case FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer ): + case sizeof(struct _ATL_MODULEW): +#ifdef _WIN64 + case sizeof(struct _ATL_MODULEW) + sizeof(void *): +#endif + ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); + break; + default: + ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); + break; + } + } +} + +START_TEST(module) +{ + test_StructSize(); +} Propchange: trunk/rostests/winetests/atl/module.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/atl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/testlist.c?… ============================================================================== --- trunk/rostests/winetests/atl/testlist.c (added) +++ trunk/rostests/winetests/atl/testlist.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,15 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_module(void); + +const struct test winetest_testlist[] = +{ + { "module", func_module }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/atl/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/api.c?… ============================================================================== --- trunk/rostests/winetests/avifil32/api.c (added) +++ trunk/rostests/winetests/avifil32/api.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,461 @@ +/* + * Unit test suite for AVI Functions + * + * Copyright 2008 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "vfw.h" +#include "wine/test.h" + +/* ########################### */ + +static const CHAR winetest0[] = "winetest0"; +static const CHAR winetest1[] = "winetest1"; +static const CHAR testfilename[] = "wine_avifil32_test.avi"; + +/* ########################### */ + +static const DWORD deffh[] = /* file_header */ +{ + FOURCC_RIFF, 0x34c6 /* length */, formtypeAVI, + FOURCC_LIST, 0x1ac /* length */, + listtypeAVIHEADER, ckidAVIMAINHDR, sizeof(MainAVIHeader), +}; + +static const MainAVIHeader defmah = +{ + 0x00008256, /* dwMicroSecPerFrame */ + 0x000080e8, /* dwMaxBytesPerSec */ + 0x00000000, /* dwPaddingGranularity */ + 0x00000910, /* dwFlags */ + 1, /* dwTotalFrames */ + 0, /* dwInitialFrames */ + 2, /* dwStreams */ + 0x00100000, /* dwSuggestedBufferSize*/ + 8, /* dwWidth */ + 6, /* dwHeight */ + { 0, 0, 0, 0 } /* dwReserved[4] */ +}; + +static const AVIStreamHeader defash0 = +{ + streamtypeVIDEO, /* fccType */ + 0x30323449, /* fccHandler */ + 0x00000000, /* dwFlags */ + 0, /* wPriority */ + 0, /* wLanguage */ + 0, /* dwInitialFrames */ + 0x000003e9, /* dwScale */ + 0x00007530, /* dwRate */ + 0, /* dwStart */ + 1, /* dwLength */ + 0x00100000, /* dwSuggestedBufferSize*/ + 0xffffffff, /* dwQuality */ + 0, /* dwSampleSize */ + { 0, 0, 0, 0 } /* short left right top bottom */ +}; + +static const AVIStreamHeader defash1 = +{ + /* AVIStreamHeader */ + streamtypeAUDIO, /* fccType */ + 1, /* fccHandler */ + 0, /* dwFlags */ + 0, /* wPriority */ + 0, /* wLanguage */ + 0, /* dwInitialFrames */ + 1, /* dwScale */ + 0x00002b11, /* dwRate */ + 0, /* dwStart */ + 0x00000665, /* dwLength */ + 0x00003000, /* dwSuggestedBufferSize*/ + 0xffffffff, /* dwQuality */ + 2, /* dwSampleSize */ + { 0, 0, 0, 0 } /* short left right top bottom */ +}; + +static const PCMWAVEFORMAT defpcmwf = +{ + { + 1, /* wFormatTag */ + 2, /* nChannels */ + 11025, /* nSamplesPerSec */ + 22050, /* nAvgBytesPerSec */ + 2, /* nBlockAlign */ + }, + 8, /* wBitsPerSample */ +}; + +typedef struct common_avi_headers { + DWORD fh[sizeof(deffh)]; + MainAVIHeader mah; + AVIStreamHeader ash0; + AVIStreamHeader ash1; + PCMWAVEFORMAT pcmwf; +} COMMON_AVI_HEADERS; + +/* Extra data needed to get the VFW API to load the file */ +/* DWORD deffh */ +/* MainAVIHeader mah */ +static const DWORD streamlist[] = +{ + FOURCC_LIST, 0xd4 /* length */, + listtypeSTREAMHEADER, ckidSTREAMHEADER, 0x38 /* length */, +}; +/* AVIStreamHeader ash0 */ +static const DWORD videostreamformat[] = +{ + ckidSTREAMFORMAT, 0x28 /* length */, + 0x00000028, 0x00000008, 0x00000006, 0x00180001, + 0x30323449, 0x00000090, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, +}; +static const DWORD padding1[] = +{ + ckidAVIPADDING, 0xc /* length */, + 0x00000004, 0x00000000, 0x63643030 +}; +static const DWORD videopropheader[] = +{ + 0x70727076, 0x44 /* length */, + 0x00000000, 0x00000000, + 0x0000001e, 0x00000008, 0x00000006, 0x00100009, + 0x00000008, 0x00000006, 0x00000001, 0x00000006, + 0x00000008, 0x00000006, 0x00000008, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, + FOURCC_LIST, 0x70 /* length */, + listtypeSTREAMHEADER, ckidSTREAMHEADER, 0x38 /* length */, +}; +/* AVIStreamHeader ash1 */ +static const DWORD audiostreamformat_pre[] = +{ + ckidSTREAMFORMAT, sizeof(PCMWAVEFORMAT) /* length */, +}; +/* PCMWAVEFORMAT pcmwf */ +static DWORD data[] = +{ + ckidAVIPADDING, 0xc /* length */, + 0x00000004, 0x00000000, 0x62773130, + ckidAVIPADDING, 0xc /* length */, + 0x6c6d646f, 0x686c6d64, 0x000000f8, + FOURCC_LIST, 0x18 /* length */, + 0x4f464e49, + 0x54465349, 0xc /* length */, + 0x6676614c, 0x332e3235, 0x00302e37, + ckidAVIPADDING, 0x4 /* length */, + 0, + FOURCC_LIST, 0xd1b /* length */, listtypeAVIMOVIE, + 0, 0 +}; + +/* ########################### */ + +static void test_AVISaveOptions(void) +{ + AVICOMPRESSOPTIONS options[2]; + LPAVICOMPRESSOPTIONS poptions[2]; + PAVISTREAM streams[2] = {NULL, NULL}; + HRESULT hres; + DWORD res; + LONG lres; + + poptions[0] = &options[0]; + poptions[1] = &options[1]; + ZeroMemory(options, sizeof(options)); + + SetLastError(0xdeadbeef); + hres = CreateEditableStream(&streams[0], NULL); + ok(hres == AVIERR_OK, "0: got 0x%x and %p (expected AVIERR_OK)\n", hres, streams[0]); + + SetLastError(0xdeadbeef); + hres = CreateEditableStream(&streams[1], NULL); + ok(hres == AVIERR_OK, "1: got 0x%x and %p (expected AVIERR_OK)\n", hres, streams[1]); + + SetLastError(0xdeadbeef); + hres = EditStreamSetNameA(streams[0], winetest0); + todo_wine ok(hres == AVIERR_OK, "0: got 0x%x (expected AVIERR_OK)\n", hres); + + SetLastError(0xdeadbeef); + hres = EditStreamSetNameA(streams[1], winetest1); + todo_wine ok(hres == AVIERR_OK, "1: got 0x%x (expected AVIERR_OK)\n", hres); + + if (winetest_interactive) { + SetLastError(0xdeadbeef); + res = AVISaveOptions(0, ICMF_CHOOSE_DATARATE |ICMF_CHOOSE_KEYFRAME | ICMF_CHOOSE_ALLCOMPRESSORS, + 2, streams, poptions); + trace("got %u with 0x%x/%u\n", res, GetLastError(), GetLastError()); + } + + SetLastError(0xdeadbeef); + lres = AVISaveOptionsFree(2, poptions); + ok(lres == AVIERR_OK, "got 0x%x with 0x%x/%u\n", lres, GetLastError(), GetLastError()); + + SetLastError(0xdeadbeef); + res = AVIStreamRelease(streams[0]); + ok(res == 0, "0: got refcount %u (expected 0)\n", res); + + SetLastError(0xdeadbeef); + res = AVIStreamRelease(streams[1]); + ok(res == 0, "1: got refcount %u (expected 0)\n", res); + +} + +/* ########################### */ + +static void init_test_struct(COMMON_AVI_HEADERS *cah) +{ + memcpy(cah->fh, deffh, sizeof(deffh)); + cah->mah = defmah; + cah->ash0 = defash0; + cah->ash1 = defash1; + cah->pcmwf = defpcmwf; +} + +static void create_avi_file(const COMMON_AVI_HEADERS *cah, char *filename) +{ + HANDLE hFile; + DWORD written; + + hFile = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + ok(hFile != INVALID_HANDLE_VALUE, "Couldn't create file\n"); + + WriteFile(hFile, &cah->fh, sizeof(deffh), &written, NULL); + WriteFile(hFile, &cah->mah, sizeof(MainAVIHeader), &written, NULL); + WriteFile(hFile, streamlist, sizeof(streamlist), &written, NULL); + WriteFile(hFile, &cah->ash0, 0x38, &written, NULL); + WriteFile(hFile, videostreamformat, sizeof(videostreamformat), &written, NULL); + WriteFile(hFile, padding1, sizeof(padding1), &written, NULL); + WriteFile(hFile, videopropheader, sizeof(videopropheader), &written, NULL); + WriteFile(hFile, &cah->ash1, 0x38, &written, NULL); + WriteFile(hFile, audiostreamformat_pre, sizeof(audiostreamformat_pre), &written, NULL); + WriteFile(hFile, &cah->pcmwf, sizeof(PCMWAVEFORMAT), &written, NULL); + WriteFile(hFile, data, sizeof(data), &written, NULL); + + CloseHandle(hFile); +} + +static void test_default_data(void) +{ + COMMON_AVI_HEADERS cah; + char filename[MAX_PATH]; + PAVIFILE pFile; + int res; + LONG lSize; + PAVISTREAM pStream0; + PAVISTREAM pStream1; + AVISTREAMINFO asi0; + AVISTREAMINFO asi1; + WAVEFORMATEX wfx; + + GetTempPath(MAX_PATH, filename); + strcpy(filename+strlen(filename), testfilename); + + init_test_struct(&cah); + create_avi_file(&cah, filename); + + res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + ok(res != AVIERR_BADFORMAT, "Unable to open file: error1=%u\n", AVIERR_BADFORMAT); + ok(res != AVIERR_MEMORY, "Unable to open file: error2=%u\n", AVIERR_MEMORY); + ok(res != AVIERR_FILEREAD, "Unable to open file: error3=%u\n", AVIERR_FILEREAD); + ok(res != AVIERR_FILEOPEN, "Unable to open file: error4=%u\n", AVIERR_FILEOPEN); + ok(res != REGDB_E_CLASSNOTREG, "Unable to open file: error5=%u\n", REGDB_E_CLASSNOTREG); + ok(res == 0, "Unable to open file: error=%u\n", res); + + res = AVIFileGetStream(pFile, &pStream0, 0, 0); + ok(res == 0, "Unable to open video stream: error=%u\n", res); + + res = AVIFileGetStream(pFile, &pStream1, 0, 1); + ok(res == 0, "Unable to open audio stream: error=%u\n", res); + + res = AVIStreamInfo(pStream0, &asi0, sizeof(AVISTREAMINFO)); + ok(res == 0, "Unable to read stream info: error=%u\n", res); + + res = AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)); + ok(res == 0, "Unable to read stream info: error=%u\n", res); + + res = AVIStreamReadFormat(pStream0, AVIStreamStart(pStream1), NULL, &lSize); + ok(res == 0, "Unable to read format size: error=%u\n", res); + + res = AVIStreamReadFormat(pStream1, AVIStreamStart(pStream1), &wfx, &lSize); + ok(res == 0, "Unable to read format: error=%u\n", res); + + ok(asi0.fccType == streamtypeVIDEO, "got 0x%x (expected streamtypeVIDEO)\n", asi0.fccType); + ok(asi0.fccHandler == 0x30323449, "got 0x%x (expected 0x30323449)\n", asi0.fccHandler); + ok(asi0.dwFlags == 0, "got %u (expected 0)\n", asi0.dwFlags); + ok(asi0.wPriority == 0, "got %u (expected 0)\n", asi0.wPriority); + ok(asi0.wLanguage == 0, "got %u (expected 0)\n", asi0.wLanguage); + ok(asi0.dwScale == 1001, "got %u (expected 1001)\n", asi0.dwScale); + ok(asi0.dwRate == 30000, "got %u (expected 30000)\n", asi0.dwRate); + ok(asi0.dwStart == 0, "got %u (expected 0)\n", asi0.dwStart); + ok(asi0.dwLength == 1, "got %u (expected 1)\n", asi0.dwLength); + ok(asi0.dwInitialFrames == 0, "got %u (expected 0)\n", asi0.dwInitialFrames); + ok(asi0.dwSuggestedBufferSize == 0, "got %u (expected 0)\n", asi0.dwSuggestedBufferSize); + ok(asi0.dwQuality == 0xffffffff, "got 0x%x (expected 0xffffffff)\n", asi0.dwQuality); + ok(asi0.dwSampleSize == 0, "got %u (expected 0)\n", asi0.dwSampleSize); + ok(asi0.rcFrame.left == 0, "got %u (expected 0)\n", asi0.rcFrame.left); + ok(asi0.rcFrame.top == 0, "got %u (expected 0)\n", asi0.rcFrame.top); + ok(asi0.rcFrame.right == 8, "got %u (expected 8)\n", asi0.rcFrame.right); /* these are based on the values in the mah and not */ + ok(asi0.rcFrame.bottom == 6, "got %u (expected 6)\n", asi0.rcFrame.bottom);/* on the ones in the ash which are 0 here */ + ok(asi0.dwEditCount == 0, "got %u (expected 0)\n", asi0.dwEditCount); + ok(asi0.dwFormatChangeCount == 0, "got %u (expected 0)\n", asi0.dwFormatChangeCount); + + ok(asi1.fccType == streamtypeAUDIO, "got 0x%x (expected streamtypeVIDEO)\n", asi1.fccType); + ok(asi1.fccHandler == 0x1, "got 0x%x (expected 0x1)\n", asi1.fccHandler); + ok(asi1.dwFlags == 0, "got %u (expected 0)\n", asi1.dwFlags); + ok(asi1.wPriority == 0, "got %u (expected 0)\n", asi1.wPriority); + ok(asi1.wLanguage == 0, "got %u (expected 0)\n", asi1.wLanguage); + ok(asi1.dwScale == 1, "got %u (expected 1)\n", asi1.dwScale); + ok(asi1.dwRate == 11025, "got %u (expected 11025)\n", asi1.dwRate); + ok(asi1.dwStart == 0, "got %u (expected 0)\n", asi1.dwStart); + ok(asi1.dwLength == 1637, "got %u (expected 1637)\n", asi1.dwLength); + ok(asi1.dwInitialFrames == 0, "got %u (expected 0)\n", asi1.dwInitialFrames); + ok(asi1.dwSuggestedBufferSize == 0, "got %u (expected 0)\n", asi1.dwSuggestedBufferSize); + ok(asi1.dwQuality == 0xffffffff, "got 0x%x (expected 0xffffffff)\n", asi1.dwQuality); + ok(asi1.dwSampleSize == 2, "got %u (expected 2)\n", asi1.dwSampleSize); + ok(asi1.rcFrame.left == 0, "got %u (expected 0)\n", asi1.rcFrame.left); + ok(asi1.rcFrame.top == 0, "got %u (expected 0)\n", asi1.rcFrame.top); + ok(asi1.rcFrame.right == 0, "got %u (expected 0)\n", asi1.rcFrame.right); + ok(asi1.rcFrame.bottom == 0, "got %u (expected 0)\n", asi1.rcFrame.bottom); + ok(asi1.dwEditCount == 0, "got %u (expected 0)\n", asi1.dwEditCount); + ok(asi1.dwFormatChangeCount == 0, "got %u (expected 0)\n", asi1.dwFormatChangeCount); + + ok(wfx.wFormatTag == 1, "got %u (expected 1)\n",wfx.wFormatTag); + ok(wfx.nChannels == 2, "got %u (expected 2)\n",wfx.nChannels); + ok(wfx.wFormatTag == 1, "got %u (expected 1)\n",wfx.wFormatTag); + ok(wfx.nSamplesPerSec == 11025, "got %u (expected 11025)\n",wfx.nSamplesPerSec); + ok(wfx.nAvgBytesPerSec == 22050, "got %u (expected 22050)\n",wfx.nAvgBytesPerSec); + ok(wfx.nBlockAlign == 2, "got %u (expected 2)\n",wfx.nBlockAlign); + + AVIStreamRelease(pStream0); + AVIStreamRelease(pStream1); + AVIFileRelease(pFile); + ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); +} + +static void test_amh_corruption(void) +{ + COMMON_AVI_HEADERS cah; + char filename[MAX_PATH]; + PAVIFILE pFile; + int res; + + GetTempPath(MAX_PATH, filename); + strcpy(filename+strlen(filename), testfilename); + + /* Make sure only AVI files with the proper headers will be loaded */ + init_test_struct(&cah); + cah.fh[3] = mmioFOURCC('A', 'V', 'i', ' '); + + create_avi_file(&cah, filename); + res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + ok(res != 0, "Able to open file: error=%u\n", res); + + ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); +} + +static void test_ash1_corruption(void) +{ + COMMON_AVI_HEADERS cah; + char filename[MAX_PATH]; + PAVIFILE pFile; + int res; + PAVISTREAM pStream1; + AVISTREAMINFO asi1; + + GetTempPath(MAX_PATH, filename); + strcpy(filename+strlen(filename), testfilename); + + /* Corrupt the sample size in the audio stream header */ + init_test_struct(&cah); + cah.ash1.dwSampleSize = 0xdeadbeef; + + create_avi_file(&cah, filename); + + res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + ok(res == 0, "Unable to open file: error=%u\n", res); + + res = AVIFileGetStream(pFile, &pStream1, 0, 1); + ok(res == 0, "Unable to open audio stream: error=%u\n", res); + + res = AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)); + ok(res == 0, "Unable to read stream info: error=%u\n", res); + + /* The result will still be 2, because the value is dynamically replaced with the nBlockAlign + value from the stream format header. The next test will prove this */ + ok(asi1.dwSampleSize == 2, "got %u (expected 2)\n", asi1.dwSampleSize); + + AVIStreamRelease(pStream1); + AVIFileRelease(pFile); + ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); +} + +static void test_ash1_corruption2(void) +{ + COMMON_AVI_HEADERS cah; + char filename[MAX_PATH]; + PAVIFILE pFile; + int res; + PAVISTREAM pStream1; + AVISTREAMINFO asi1; + + GetTempPath(MAX_PATH, filename); + strcpy(filename+strlen(filename), testfilename); + + /* Corrupt the block alignment in the audio format header */ + init_test_struct(&cah); + cah.pcmwf.wf.nBlockAlign = 0xdead; + + create_avi_file(&cah, filename); + + res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + ok(res == 0, "Unable to open file: error=%u\n", res); + + res = AVIFileGetStream(pFile, &pStream1, 0, 1); + ok(res == 0, "Unable to open audio stream: error=%u\n", res); + + ok(AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)) == 0, "Unable to read stream info\n"); + + /* The result will also be the corrupt value, as explained above. */ + ok(asi1.dwSampleSize == 0xdead, "got 0x%x (expected 0xdead)\n", asi1.dwSampleSize); + + AVIStreamRelease(pStream1); + AVIFileRelease(pFile); + ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); +} + +/* ########################### */ + +START_TEST(api) +{ + + AVIFileInit(); + test_AVISaveOptions(); + test_default_data(); + test_amh_corruption(); + test_ash1_corruption(); + test_ash1_corruption2(); + AVIFileExit(); + +} Propchange: trunk/rostests/winetests/avifil32/api.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/avifil… ============================================================================== --- trunk/rostests/winetests/avifil32/avifil32.rbuild (added) +++ trunk/rostests/winetests/avifil32/avifil32.rbuild [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="avifil32_winetest" type="win32cui" installbase="bin" installname="avifil32_winetest.exe" allowwarnings="true"> + <include base="avifil32_winetest">.</include> + <library>avifil32</library> + <library>wine</library> + <file>api.c</file> + <file>testlist.c</file> +</module> +</group> Propchange: trunk/rostests/winetests/avifil32/avifil32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/avifil32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/testli… ============================================================================== --- trunk/rostests/winetests/avifil32/testlist.c (added) +++ trunk/rostests/winetests/avifil32/testlist.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -1,0 +1,15 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_api(void); + +const struct test winetest_testlist[] = +{ + { "api", func_api }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/avifil32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… ============================================================================== --- trunk/rostests/winetests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/directory.rbuild [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -10,6 +10,15 @@ <directory name="advpack"> <xi:include href="advpack/advpack.rbuild" /> </directory> + <directory name="amstream"> + <xi:include href="amstream/amstream.rbuild" /> + </directory> + <directory name="atl"> + <xi:include href="atl/atl.rbuild" /> + </directory> + <directory name="avifil32"> + <xi:include href="avifil32/avifil32.rbuild" /> + </directory> <directory name="browseui"> <xi:include href="browseui/browseui.rbuild" /> </directory> @@ -147,6 +156,9 @@ </directory> <directory name="oleaut32"> <xi:include href="oleaut32/oleaut32.rbuild" /> + </directory> + <directory name="opengl32"> + <xi:include href="opengl32/opengl32.rbuild" /> </directory> <directory name="pdh"> <xi:include href="pdh/pdh.rbuild" /> Modified: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -22,6 +22,10 @@ #include <wingdi.h> #include "wine/test.h" +void WINAPI glClearColor(float red, float green, float blue, float alpha); +void WINAPI glClear(unsigned int mask); +void WINAPI glFinish(void); +#define GL_COLOR_BUFFER_BIT 0x00004000 const unsigned char * WINAPI glGetString(unsigned int); #define GL_VENDOR 0x1F00 #define GL_RENDERER 0x1F01 @@ -499,6 +503,148 @@ } } +static void test_bitmap_rendering(void) +{ + PIXELFORMATDESCRIPTOR pfd; + int i, iPixelFormat=0; + unsigned int nFormats; + HGLRC hglrc; + BITMAPINFO biDst; + HBITMAP bmpDst, oldDst; + HDC hdcDst, hdcScreen; + UINT32 *dstBuffer; + + memset(&biDst, 0, sizeof(BITMAPINFO)); + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 2; + biDst.bmiHeader.biHeight = -2; + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; + biDst.bmiHeader.biCompression = BI_RGB; + + hdcScreen = CreateCompatibleDC(0); + if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) + { + DeleteDC(hdcScreen); + trace("Skipping bitmap rendering test\n"); + return; + } + + hdcDst = CreateCompatibleDC(hdcScreen); + bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + /* Pick a pixel format by hand because ChoosePixelFormat is unreliable */ + nFormats = DescribePixelFormat(hdcDst, 0, 0, NULL); + for(i=1; i<=nFormats; i++) + { + memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); + DescribePixelFormat(hdcDst, i, sizeof(PIXELFORMATDESCRIPTOR), &pfd); + + if((pfd.dwFlags & PFD_DRAW_TO_BITMAP) && + (pfd.dwFlags & PFD_SUPPORT_OPENGL) && + (pfd.cColorBits == 32) && + (pfd.cAlphaBits == 8) ) + { + iPixelFormat = i; + break; + } + } + + if(!iPixelFormat) + { + skip("Unable to find a suitable pixel format\n"); + } + else + { + SetPixelFormat(hdcDst, iPixelFormat, &pfd); + hglrc = wglCreateContext(hdcDst); + todo_wine ok(hglrc != NULL, "Unable to create a context\n"); + + if(hglrc) + { + wglMakeCurrent(hdcDst, hglrc); + + /* Note this is RGBA but we read ARGB back */ + glClearColor((float)0x22/0xff, (float)0x33/0xff, (float)0x44/0xff, (float)0x11/0xff); + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + + /* Note apparently the alpha channel is not supported by the software renderer (bitmap only works using software) */ + ok(dstBuffer[0] == 0x223344, "Expected color=0x223344, received color=%x\n", dstBuffer[0]); + + wglMakeCurrent(NULL, NULL); + wglDeleteContext(hglrc); + } + } + + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + DeleteDC(hdcDst); + + DeleteDC(hdcScreen); +} + +struct wgl_thread_param +{ + HANDLE test_finished; + HGLRC hglrc; + BOOL hglrc_deleted; +}; + +static DWORD WINAPI wgl_thread(void *param) +{ + struct wgl_thread_param *p = param; + + p->hglrc_deleted = wglDeleteContext(p->hglrc); + SetEvent(p->test_finished); + + return 0; +} + +static void test_deletecontext(HDC hdc) +{ + struct wgl_thread_param thread_params; + HGLRC hglrc = wglCreateContext(hdc); + HANDLE thread_handle; + DWORD res, tid; + + if(!hglrc) + { + skip("wglCreateContext failed!\n"); + return; + } + + res = wglMakeCurrent(hdc, hglrc); + if(!res) + { + skip("wglMakeCurrent failed!\n"); + return; + } + + /* WGL doesn't allow you to delete a context from a different thread than the one in which it is current. + * This differs from GLX which does allow it but it delays actual deletion until the context becomes not current. + */ + thread_params.hglrc = hglrc; + thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + thread_handle = CreateThread(NULL, 0, wgl_thread, &thread_params, 0, &tid); + ok(!!thread_handle, "Failed to create thread, last error %#x.\n", GetLastError()); + if(thread_handle) + { + WaitForSingleObject(thread_handle, INFINITE); + ok(thread_params.hglrc_deleted == FALSE, "Attempt to delete WGL context from another thread passed but should fail!\n"); + } + CloseHandle(thread_params.test_finished); + + res = wglDeleteContext(hglrc); + ok(res == TRUE, "wglDeleteContext failed\n"); + + /* WGL makes a context not current when deleting it. This differs from GLX behavior where + * deletion takes place when the thread becomes not current. */ + hglrc = wglGetCurrentContext(); + ok(hglrc == NULL, "A WGL context is active while none was expected\n"); +} + static void test_make_current_read(HDC hdc) { int res; @@ -648,6 +794,75 @@ if(gl3Ctx) wglDeleteContext(gl3Ctx); } +} + +static void test_minimized(void) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + LONG style; + HGLRC ctx; + BOOL ret; + HDC dc; + + window = CreateWindowA("static", "opengl32_test", + WS_POPUP | WS_MINIMIZE, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create window, last error %#x.\n", GetLastError()); + + dc = GetDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + style = GetWindowLongA(window, GWL_STYLE); + ok(style & WS_MINIMIZE, "Window should be minimized, got style %#x.\n", style); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + style = GetWindowLongA(window, GWL_STYLE); + ok(style & WS_MINIMIZE, "window should be minimized, got style %#x.\n", style); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + DestroyWindow(window); } START_TEST(opengl) @@ -704,6 +919,8 @@ res = SetPixelFormat(hdc, iPixelFormat, &pfd); ok(res, "SetPixelformat failed: %x\n", GetLastError()); + test_bitmap_rendering(); + test_minimized(); test_dc(hwnd, hdc); hglrc = wglCreateContext(hdc); @@ -732,6 +949,7 @@ return; } + test_deletecontext(hdc); test_makecurrent(hdc); test_setpixelformat(hdc); test_sharelists(hdc); Modified: trunk/rostests/winetests/powrprof/pwrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/pwrpro… ============================================================================== --- trunk/rostests/winetests/powrprof/pwrprof.c [iso-8859-1] (original) +++ trunk/rostests/winetests/powrprof/pwrprof.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -10,7 +10,7 @@ #include "powrprof.h" #include "assert.h" #include "winnt.h" -#include "wine/unicode.h" + /* LONG WINAPI RegOpenCurrentUser(REGSAM a,PHKEY b) { @@ -22,18 +22,6 @@ unsigned int g_NumPwrSchemesEnumerated = 0; unsigned int g_ActivePwrScheme = 3; unsigned int g_TempPwrScheme = 99; - -#if 0 // FIXME: needed to build. Please update pwrprof winetest. -typedef struct _PROCESSOR_POWER_INFORMATION { - ULONG Number; - ULONG MaxMhz; - ULONG CurrentMhz; - ULONG MhzLimit; - ULONG MaxIdleState; - ULONG CurrentIdleState; -} PROCESSOR_POWER_INFORMATION, -*PPROCESSOR_POWER_INFORMATION; -#endif POWER_POLICY g_PowerPolicy; Modified: trunk/rostests/winetests/quartz/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/testlist… ============================================================================== --- trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] Tue Jul 6 09:44:43 2010 @@ -7,21 +7,23 @@ #include "wine/test.h" extern void func_avisplitter(void); +extern void func_dsoundrender(void); +extern void func_filtergraph(void); +extern void func_filtermapper(void); +extern void func_memallocator(void); +extern void func_misc(void); +extern void func_referenceclock(void); extern void func_videorenderer(void); -extern void func_referenceclock(void); -extern void func_misc(void); -extern void func_memallocator(void); -extern void func_filtermapper(void); -extern void func_filtergraph(void); const struct test winetest_testlist[] = { { "avisplitter", func_avisplitter }, + { "dsoundrender", func_dsoundrender }, + { "filtergraph", func_filtergraph }, + { "filtermapper", func_filtermapper }, + { "memallocator", func_memallocator }, + { "misc", func_misc }, { "videorenderer", func_videorenderer }, { "referenceclock", func_referenceclock }, - { "misc", func_misc }, - { "memallocator", func_memallocator }, - { "filtermapper", func_filtermapper }, - { "filtergraph", func_filtergraph }, { 0, 0 } };

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