Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 43754: partial kernel32 GetLocaleInfo sync to wine 1.1.32
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 22:02:58 2009 New Revision: 43754 URL: http://svn.reactos.org/svn/reactos?rev=43754&view=rev Log: partial kernel32 GetLocaleInfo sync to wine 1.1.32 Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Sun Oct 25 22:02:58 2009 @@ -28,7 +28,8 @@ #define LOCALE_RETURN_NUMBER 0x20000000 #define LOCALE_USE_CP_ACP 0x40000000 -#define LOCALE_LOCALEINFOFLAGSMASK (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP|LOCALE_RETURN_NUMBER) +#define LOCALE_LOCALEINFOFLAGSMASK (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP|\ + LOCALE_RETURN_NUMBER|LOCALE_RETURN_GENITIVE_NAMES) #define CALINFO_MAX_YEAR 2029 //static LCID SystemLocale = MAKELCID(LANG_ENGLISH, SORT_DEFAULT); @@ -52,6 +53,62 @@ static const WCHAR szLocaleKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\NLS\\Locale"; static const WCHAR szLangGroupsKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\NLS\\Language Groups"; + +/*********************************************************************** + * is_genitive_name_supported + * + * Determine could LCTYPE basically support genitive name form or not. + */ +static BOOL is_genitive_name_supported( LCTYPE lctype ) +{ + switch(lctype & 0xffff) + { + case LOCALE_SMONTHNAME1: + case LOCALE_SMONTHNAME2: + case LOCALE_SMONTHNAME3: + case LOCALE_SMONTHNAME4: + case LOCALE_SMONTHNAME5: + case LOCALE_SMONTHNAME6: + case LOCALE_SMONTHNAME7: + case LOCALE_SMONTHNAME8: + case LOCALE_SMONTHNAME9: + case LOCALE_SMONTHNAME10: + case LOCALE_SMONTHNAME11: + case LOCALE_SMONTHNAME12: + case LOCALE_SMONTHNAME13: + return TRUE; + default: + return FALSE; + } +} + +/*********************************************************************** + * create_registry_key + * + * Create the Control Panel\\International registry key. + */ +static inline HANDLE create_registry_key(void) +{ + static const WCHAR intlW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'I','n','t','e','r','n','a','t','i','o','n','a','l',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + + if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &hkey ) != STATUS_SUCCESS) return 0; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, intlW ); + + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) hkey = 0; + NtClose( attr.RootDirectory ); + return hkey; +} /****************************************************************************** * @implemented @@ -1751,6 +1808,13 @@ SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (LCType & LOCALE_RETURN_GENITIVE_NAMES && + !is_genitive_name_supported( LCType )) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (!cchData) lpLCData = NULL; if (Locale == LOCALE_NEUTRAL || Locale == LOCALE_SYSTEM_DEFAULT) Locale = GetSystemDefaultLCID(); @@ -1781,10 +1845,23 @@ return 0; ch = LockResource( hMem ); - for (i = 0; i < (int)(LCType & 0x0f); i++) ch += *ch + 1; + for (i = 0; i < (LCType & 0x0f); i++) ch += *ch + 1; if (uiFlags & LOCALE_RETURN_NUMBER) nRet = sizeof(UINT) / sizeof(WCHAR); - else nRet = (LCType == LOCALE_FONTSIGNATURE) ? *ch : *ch + 1; + else if (is_genitive_name_supported( LCType ) && *ch) + { + /* genitive form's stored after a null separator from a nominative */ + for (i = 1; i <= *ch; i++) if (!ch[i]) break; + + if (i <= *ch && (uiFlags & LOCALE_RETURN_GENITIVE_NAMES)) + { + nRet = *ch - i + 1; + ch += i; + } + else nRet = i; + } + else + nRet = (LCType == LOCALE_FONTSIGNATURE) ? *ch : *ch + 1; if (!lpLCData) return nRet; @@ -2092,6 +2169,12 @@ SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (lctype & LOCALE_RETURN_GENITIVE_NAMES ) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (!len) buffer = NULL; if (!(lenW = GetLocaleInfoW( lcid, lctype, NULL, 0 ))) return 0; @@ -2234,35 +2317,6 @@ } -/*********************************************************************** - * create_registry_key - * - * Create the Control Panel\\International registry key. - */ -static inline HANDLE create_registry_key(void) -{ - static const WCHAR intlW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', - 'I','n','t','e','r','n','a','t','i','o','n','a','l',0}; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - HANDLE hkey; - - if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &hkey ) != STATUS_SUCCESS) return 0; - - attr.Length = sizeof(attr); - attr.RootDirectory = hkey; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, intlW ); - - if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) hkey = 0; - NtClose( attr.RootDirectory ); - return hkey; -} - - /* * @unimplemented */

1 0

[hyperion] 43753: "nslookup" branch for anakha, me and Z98, and whoever wants to follow the import of BIND nslookup
by hyperion＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: hyperion Date: Sun Oct 25 21:43:02 2009 New Revision: 43753 URL: http://svn.reactos.org/svn/reactos?rev=43753&view=rev Log: "nslookup" branch for anakha, me and Z98, and whoever wants to follow the import of BIND nslookup Added: branches/nslookup/ (props changed) - copied from r43752, trunk/reactos/ Propchange: branches/nslookup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 25 21:43:02 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nslookup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nslookup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nslookup/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Oct 25 21:43:02 2009 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/nslookup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Oct 25 21:43:02 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 Propchange: branches/nslookup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[cwittich] 43752: -sync user32_winetest with wine 1.1.32
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 21:32:13 2009 New Revision: 43752 URL: http://svn.reactos.org/svn/reactos?rev=43752&view=rev Log: -sync user32_winetest with wine 1.1.32 Modified: trunk/rostests/winetests/user32/class.c trunk/rostests/winetests/user32/dde.c trunk/rostests/winetests/user32/input.c trunk/rostests/winetests/user32/listbox.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/class.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/class.c?… ============================================================================== --- trunk/rostests/winetests/user32/class.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/class.c [iso-8859-1] Sun Oct 25 21:32:13 2009 @@ -831,9 +831,41 @@ } } +static const struct +{ + const char name[9]; + int value; + int badvalue; +} extra_values[] = +{ + {"#32770",30,30}, /* Dialog */ +#ifdef _WIN64 + {"Edit",8,8}, +#else + {"Edit",6,8}, /* Windows XP 64-bit returns 8 also to 32-bit applications */ +#endif +}; + +static void test_extra_values(void) +{ + int i; + for(i=0; i< sizeof(extra_values)/sizeof(extra_values[0]); i++) + { + WNDCLASSEX wcx; + BOOL ret = GetClassInfoEx(NULL,extra_values[i].name,&wcx); + + ok( ret, "GetClassInfo (0) failed for global class %s\n", extra_values[i].name); + if (!ret) continue; + ok(extra_values[i].value == wcx.cbWndExtra || broken(extra_values[i].badvalue == wcx.cbWndExtra), + "expected %d, got %d\n", extra_values[i].value, wcx.cbWndExtra); + } +} + START_TEST(class) { HANDLE hInstance = GetModuleHandleA( NULL ); + + test_extra_values(); if (!GetModuleHandleW(0)) { Modified: trunk/rostests/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dde.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dde.c [iso-8859-1] Sun Oct 25 21:32:13 2009 @@ -211,7 +211,7 @@ executed = TRUE; - lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, DDE_FACK, HIWORD(lparam)); + lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, DDE_FACK, lparam); PostMessageA(client, WM_DDE_ACK, (WPARAM)hwnd, lparam); break; Modified: trunk/rostests/winetests/user32/input.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/input.c?… ============================================================================== --- trunk/rostests/winetests/user32/input.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/input.c [iso-8859-1] Sun Oct 25 21:32:13 2009 @@ -904,7 +904,12 @@ SetWindowPos( window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); SetForegroundWindow( window ); - hook = SetWindowsHookExA(WH_KEYBOARD_LL, hook_proc, GetModuleHandleA( NULL ), 0); + if (!(hook = SetWindowsHookExA(WH_KEYBOARD_LL, hook_proc, GetModuleHandleA( NULL ), 0))) + { + DestroyWindow(window); + win_skip("WH_KEYBOARD_LL is not supported\n"); + return; + } /* must process all initial messages, otherwise X11DRV_KeymapNotify unsets * key state set by SendInput(). */ Modified: trunk/rostests/winetests/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/listbox.… ============================================================================== --- trunk/rostests/winetests/user32/listbox.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/listbox.c [iso-8859-1] Sun Oct 25 21:32:13 2009 @@ -303,6 +303,7 @@ hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); assert(hLB); + SetForegroundWindow(hLB); UpdateWindow(hLB); /* make height short enough */ Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Sun Oct 25 21:32:13 2009 @@ -150,10 +150,12 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + static HMENU hmenupopup; switch (msg) { case WM_INITMENUPOPUP: gflag_initmenupopup++; + hmenupopup = (HMENU) wparam; break; case WM_ENTERMENULOOP: gflag_entermenuloop++; @@ -229,6 +231,11 @@ { ok( lparam || broken(!lparam), /* win9x, nt4 */ "Menu window handle is NULL!\n"); + if( lparam) { + HMENU hmenu = (HMENU)SendMessageA( (HWND)lparam, MN_GETHMENU, 0, 0); + ok( hmenupopup == hmenu, "MN_GETHMENU returns %p expected %p\n", + hmenu, hmenupopup); + } PostMessage(hwnd, WM_CANCELMODE, 0, 0); return TRUE; } Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sun Oct 25 21:32:13 2009 @@ -6870,6 +6870,36 @@ { WM_CONTEXTMENU, sent|lparam, /*hwnd*/0, (LPARAM)-1 }, { 0 } }; +static const struct message WmVkF10Seq[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_KEYMENU }, + { HCBT_SYSCOMMAND, hook }, + { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { WM_INITMENU, sent|defwinproc }, + { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 1 }, + + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0x10000001 }, /* XP */ + + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0, }, + { WM_CAPTURECHANGED, sent|defwinproc }, + { WM_MENUSELECT, sent|defwinproc|wparam|optional, MAKEWPARAM(0,0xffff) }, + { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, + { WM_EXITMENULOOP, sent|defwinproc }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { 0 } +}; static void pump_msg_loop(HWND hwnd, HACCEL hAccel) { @@ -7081,6 +7111,14 @@ keybd_event(VK_APPS, 0, KEYEVENTF_KEYUP, 0); pump_msg_loop(hwnd, 0); ok_sequence(WmVkAppsSeq, "VK_APPS press/release", FALSE); + + trace("testing VK_F10 press/release\n"); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmVkF10Seq, "VK_F10 press/release", TRUE); trace("testing Shift+MouseButton press/release\n"); /* first, move mouse pointer inside of the window client area */ Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Sun Oct 25 21:32:13 2009 @@ -569,6 +569,60 @@ DestroyWindow( owner ); } +static BOOL CALLBACK enum_proc( HWND hwnd, LPARAM lParam) +{ + (*(LPINT)lParam)++; + if (*(LPINT)lParam > 2) return FALSE; + return TRUE; +} +static DWORD CALLBACK enum_thread( void *arg ) +{ + INT count; + HWND hwnd[3]; + BOOL ret; + MSG msg; + + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure we have a message queue */ + + count = 0; + ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); + ok( ret, "EnumThreadWindows should have returned TRUE\n" ); + ok( count == 0, "count should be 0 got %d\n", count ); + + hwnd[0] = CreateWindowExA(0, "ToolWindowClass", "Tool window 1", WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL ); + count = 0; + ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); + ok( ret, "EnumThreadWindows should have returned TRUE\n" ); + if (count != 2) /* Vista gives us two windows for the price of one */ + { + ok( count == 1, "count should be 1 got %d\n", count ); + hwnd[2] = CreateWindowExA(0, "ToolWindowClass", "Tool window 2", WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL ); + } + else hwnd[2] = 0; + + hwnd[1] = CreateWindowExA(0, "ToolWindowClass", "Tool window 3", WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL ); + count = 0; + ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); + ok( !ret, "EnumThreadWindows should have returned FALSE\n" ); + ok( count == 3, "count should be 3 got %d\n", count ); + + if (hwnd[2]) DestroyWindow(hwnd[2]); + DestroyWindow(hwnd[1]); + DestroyWindow(hwnd[0]); + return 0; +} + +/* test EnumThreadWindows in a separate thread */ +static void test_enum_thread_windows(void) +{ + DWORD id; + HANDLE handle = CreateThread( NULL, 0, enum_thread, 0, 0, &id ); + ok( !WaitForSingleObject( handle, 10000 ), "wait failed\n" ); + CloseHandle( handle ); +} static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -5762,6 +5816,7 @@ test_CreateWindow(); test_parent_owner(); test_SetParent(); + test_enum_thread_windows(); test_mdi(); test_icons();

1 0

[cwittich] 43751: -sync msxml3 with wine 1.1.32
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 21:21:51 2009 New Revision: 43751 URL: http://svn.reactos.org/svn/reactos?rev=43751&view=rev Log: -sync msxml3 with wine 1.1.32 Modified: trunk/reactos/dll/win32/msxml3/attribute.c trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/docfrag.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/entityref.c trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/pi.c trunk/reactos/dll/win32/msxml3/text.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/attribute… Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… Modified: trunk/reactos/dll/win32/msxml3/docfrag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/docfrag.c… Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… Modified: trunk/reactos/dll/win32/msxml3/entityref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/entityref… Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… Modified: trunk/reactos/dll/win32/msxml3/pi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/pi.c?rev=… Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re…

1 0

[cwittich] 43750: -sync netapi32 with wine 1.1.32
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 20:24:08 2009 New Revision: 43750 URL: http://svn.reactos.org/svn/reactos?rev=43750&view=rev Log: -sync netapi32 with wine 1.1.32 Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/nbt.c trunk/reactos/dll/win32/netapi32/netapi32.c trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/share.c trunk/reactos/include/psdk/lmshare.h Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Sun Oct 25 20:24:08 2009 @@ -112,7 +112,7 @@ BOOL ret = FALSE; dwSize = LM20_UNLEN+1; - curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize); + curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); if(!curr_user) { ERR("Failed to allocate memory for user name.\n"); @@ -431,7 +431,7 @@ return status; size = UNLEN + 1; - NetApiBufferAllocate(size, (LPVOID*)&currentuser); + NetApiBufferAllocate(size * sizeof(WCHAR), (LPVOID*)&currentuser); GetUserNameW(currentuser, &size); if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username)) @@ -640,7 +640,7 @@ /* get data */ dwSize = UNLEN + 1; - NetApiBufferAllocate(dwSize, (LPVOID *) &name); + NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) &name); if (!GetUserNameW(name, &dwSize)) { NetApiBufferFree(name); @@ -728,6 +728,16 @@ { FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + return ERROR_ACCESS_DENIED; +} + +/************************************************************ + * NetGroupGetInfo (NETAPI32.@) + * + */ +NET_API_STATUS WINAPI NetGroupGetInfo(LPCWSTR servername, LPCWSTR groupname, DWORD level, LPBYTE *bufptr) +{ + FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); return ERROR_ACCESS_DENIED; } Modified: trunk/reactos/dll/win32/netapi32/nbt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbt.c?r… ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] Sun Oct 25 20:24:08 2009 @@ -1478,8 +1478,7 @@ gBCastQueries = dword; size = sizeof(dword); if (RegQueryValueExW(hKey, BcastNameQueryTimeoutW, NULL, NULL, - (LPBYTE)&dword, &size) == ERROR_SUCCESS && dword >= MIN_QUERY_TIMEOUT - && dword <= MAX_QUERY_TIMEOUT) + (LPBYTE)&dword, &size) == ERROR_SUCCESS && dword >= MIN_QUERY_TIMEOUT) gBCastQueryTimeout = dword; size = sizeof(dword); if (RegQueryValueExW(hKey, NameSrvQueryCountW, NULL, NULL, @@ -1488,8 +1487,7 @@ gWINSQueries = dword; size = sizeof(dword); if (RegQueryValueExW(hKey, NameSrvQueryTimeoutW, NULL, NULL, - (LPBYTE)&dword, &size) == ERROR_SUCCESS && dword >= MIN_QUERY_TIMEOUT - && dword <= MAX_QUERY_TIMEOUT) + (LPBYTE)&dword, &size) == ERROR_SUCCESS && dword >= MIN_QUERY_TIMEOUT) gWINSQueryTimeout = dword; size = sizeof(gScopeID) - 1; if (RegQueryValueExW(hKey, ScopeIDW, NULL, NULL, (LPBYTE)gScopeID + 1, &size) Modified: trunk/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] Sun Oct 25 20:24:08 2009 @@ -97,7 +97,7 @@ */ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr) { - FIXME("stub (%p, %d, %p)\n", servername, level, bufptr); + FIXME("stub (%s, %d, %p)\n", debugstr_w(servername), level, bufptr); return ERROR_ACCESS_DENIED; } Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sun Oct 25 20:24:08 2009 @@ -88,7 +88,7 @@ @ stub NetErrorLogRead @ stub NetErrorLogWrite @ stub NetFileClose -@ stub NetFileEnum +@ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetFileGetInfo @ stub NetGetAnyDCName @ stdcall NetGetDCName(wstr wstr ptr) @@ -99,7 +99,7 @@ @ stub NetGroupDel @ stub NetGroupDelUser @ stdcall NetGroupEnum(wstr long ptr long ptr ptr ptr) -@ stub NetGroupGetInfo +@ stdcall NetGroupGetInfo(wstr wstr long ptr) @ stub NetGroupGetUsers @ stub NetGroupSetInfo @ stub NetGroupSetUsers Modified: trunk/reactos/dll/win32/netapi32/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] Sun Oct 25 20:24:08 2009 @@ -113,3 +113,16 @@ FIXME("Stub (%s %d %p %p)\n", debugstr_w(servername), level, buf, parm_err); return ERROR_NOT_SUPPORTED; } + +/************************************************************ + * NetFileEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetFileEnum( + LPWSTR ServerName, LPWSTR BasePath, LPWSTR UserName, + DWORD Level, LPBYTE* BufPtr, DWORD PrefMaxLen, + LPDWORD EntriesRead, LPDWORD TotalEntries, PDWORD_PTR ResumeHandle) +{ + FIXME("(%s, %s, %s, %u): stub\n", debugstr_w(ServerName), debugstr_w(BasePath), + debugstr_w(UserName), Level); + return ERROR_NOT_SUPPORTED; +} Modified: trunk/reactos/include/psdk/lmshare.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/lmshare.h?rev… ============================================================================== --- trunk/reactos/include/psdk/lmshare.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/lmshare.h [iso-8859-1] Sun Oct 25 20:24:08 2009 @@ -123,20 +123,24 @@ LPWSTR coni1_username; LPWSTR coni1_netname; } CONNECTION_INFO_1,*PCONNECTION_INFO_1,*LPCONNECTION_INFO_1; -NET_API_STATUS WINAPI NetShareAdd(LPWSTR,DWORD,PBYTE,PDWORD); -NET_API_STATUS WINAPI NetShareEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); -NET_API_STATUS WINAPI NetShareEnumSticky(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD resume_handle); -NET_API_STATUS WINAPI NetShareGetInfo(LPWSTR,LPWSTR,DWORD,PBYTE*); -NET_API_STATUS WINAPI NetShareSetInfo(LPWSTR,LPWSTR,DWORD,PBYTE,PDWORD); -NET_API_STATUS WINAPI NetShareDel(LPWSTR,LPWSTR,DWORD); -NET_API_STATUS WINAPI NetShareDelSticky(LPWSTR,LPWSTR,DWORD); -NET_API_STATUS WINAPI NetShareCheck(LPWSTR,LPWSTR,PDWORD); -NET_API_STATUS WINAPI NetSessionEnum(LPWSTR,LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); -NET_API_STATUS WINAPI NetSessionDel(LPWSTR,LPWSTR,LPWSTR); -NET_API_STATUS WINAPI NetSessionGetInfo(LPWSTR,LPWSTR,LPWSTR,DWORD,PBYTE*); + +NET_API_STATUS WINAPI NetShareAdd(LMSTR,DWORD,LPBYTE,LPDWORD); +NET_API_STATUS WINAPI NetShareCheck(LMSTR,LMSTR,LPDWORD); +NET_API_STATUS WINAPI NetShareDel(LMSTR,LMSTR,DWORD); +NET_API_STATUS WINAPI NetShareDelEx(LMSTR,DWORD,LPBYTE); +NET_API_STATUS WINAPI NetShareDelSticky(LMSTR,LMSTR,DWORD); +NET_API_STATUS WINAPI NetShareEnum(LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); +NET_API_STATUS WINAPI NetShareEnumSticky(LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); +NET_API_STATUS WINAPI NetShareGetInfo(LMSTR,LMSTR,DWORD,LPBYTE*); +NET_API_STATUS WINAPI NetShareSetInfo(LMSTR,LMSTR,DWORD,LPBYTE,LPDWORD); + +NET_API_STATUS WINAPI NetSessionDel(LMSTR,LMSTR,LMSTR); +NET_API_STATUS WINAPI NetSessionEnum(LMSTR,LMSTR,LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); +NET_API_STATUS WINAPI NetSessionGetInfo(LMSTR,LMSTR,LMSTR,DWORD,LPBYTE*); + NET_API_STATUS WINAPI NetConnectionEnum(LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); NET_API_STATUS WINAPI NetFileClose(LPWSTR,DWORD); -NET_API_STATUS WINAPI NetFileEnum(LPWSTR,LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); +NET_API_STATUS WINAPI NetFileEnum(LMSTR,LMSTR,LMSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD_PTR); NET_API_STATUS WINAPI NetFileGetInfo(LPWSTR,DWORD,DWORD,PBYTE*); #ifdef __cplusplus }

1 0

[gschneider] 43749: [win32k] Stub out page to device space conversion, fixes three more gdi32 mapping winetests
by gschneider＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: gschneider Date: Sun Oct 25 19:49:08 2009 New Revision: 43749 URL: http://svn.reactos.org/svn/reactos?rev=43749&view=rev Log: [win32k] Stub out page to device space conversion, fixes three more gdi32 mapping winetests Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Oct 25 19:49:08 2009 @@ -202,12 +202,16 @@ MatrixS2XForm(XForm, &dc->dclevel.mxWorldToDevice); break; + case GdiPageSpaceToDeviceSpace: + DPRINT1("Page space -> device space is unsupported!\n"); + break; + case GdiDeviceSpaceToWorldSpace: MatrixS2XForm(XForm, &dc->dclevel.mxDeviceToWorld); break; default: - DPRINT1("Unknown or unsupported transform %lu\n", iXform); + DPRINT1("Unknown transform %lu\n", iXform); Status = STATUS_INVALID_PARAMETER; break; }

1 0

[janderwald] 43748: - Make sure that no duplicate wdmaud.drv audio drivers exists as winmm currently not recognizes duplicate audio driver entries
by janderwald＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: janderwald Date: Sun Oct 25 19:22:03 2009 New Revision: 43748 URL: http://svn.reactos.org/svn/reactos?rev=43748&view=rev Log: - Make sure that no duplicate wdmaud.drv audio drivers exists as winmm currently not recognizes duplicate audio driver entries Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sun Oct 25 19:22:03 2009 @@ -435,7 +435,26 @@ swprintf(WaveName, L"wave%u", Index); if (RegQueryValueExW(hKey, WaveName, 0, NULL, NULL, &BufferSize) != ERROR_MORE_DATA) { + /* Store new audio driver entry */ RegSetValueExW(hKey, WaveName, 0, REG_SZ, (LPBYTE)szBuffer, (wcslen(szBuffer)+1) * sizeof(WCHAR)); + break; + } + else + { + WCHAR Buffer[MAX_PATH]; + BufferSize = sizeof(Buffer); + + if (RegQueryValueExW(hKey, WaveName, 0, NULL, (LPBYTE)Buffer, &BufferSize) == ERROR_SUCCESS) + { + /* Make sure the buffer is zero terminated */ + Buffer[MAX_PATH-1] = L'\0'; + + if (!wcsicmp(Buffer, szBuffer)) + { + /* an entry already exists */ + break; + } + } } } RegCloseKey(hKey);

1 0

[janderwald] 43747: - Partially sync winmm - Remove unused code - Fix function headers
by janderwald＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: janderwald Date: Sun Oct 25 18:54:50 2009 New Revision: 43747 URL: http://svn.reactos.org/svn/reactos?rev=43747&view=rev Log: - Partially sync winmm - Remove unused code - Fix function headers Removed: trunk/reactos/dll/win32/winmm/message16.c trunk/reactos/dll/win32/winmm/mmsystem.c trunk/reactos/dll/win32/winmm/mmsystem.spec trunk/reactos/dll/win32/winmm/sound.spec trunk/reactos/dll/win32/winmm/sound16.c Modified: trunk/reactos/dll/win32/winmm/driver.c trunk/reactos/dll/win32/winmm/joystick.c trunk/reactos/dll/win32/winmm/lolvldrv.c trunk/reactos/dll/win32/winmm/mci.c trunk/reactos/dll/win32/winmm/mmio.c trunk/reactos/dll/win32/winmm/playsound.c trunk/reactos/dll/win32/winmm/time.c trunk/reactos/dll/win32/winmm/winemm.h trunk/reactos/dll/win32/winmm/winmm.c trunk/reactos/dll/win32/winmm/winmm.rbuild trunk/reactos/dll/win32/winmm/winmm.spec trunk/reactos/include/psdk/mmddk.h trunk/reactos/include/psdk/mmsystem.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/driver.c?r… Modified: trunk/reactos/dll/win32/winmm/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/joystick.c… Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lolvldrv.c… Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… Removed: trunk/reactos/dll/win32/winmm/message16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/message16.… Modified: trunk/reactos/dll/win32/winmm/mmio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mmio.c?rev… Removed: trunk/reactos/dll/win32/winmm/mmsystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mmsystem.c… Removed: trunk/reactos/dll/win32/winmm/mmsystem.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mmsystem.s… Modified: trunk/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/playsound.… Removed: trunk/reactos/dll/win32/winmm/sound.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/sound.spec… Removed: trunk/reactos/dll/win32/winmm/sound16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/sound16.c?… Modified: trunk/reactos/dll/win32/winmm/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/time.c?rev… Modified: trunk/reactos/dll/win32/winmm/winemm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winemm.h?r… Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?re… Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… Modified: trunk/reactos/dll/win32/winmm/winmm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.spec… Modified: trunk/reactos/include/psdk/mmddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmddk.h?rev=4… Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re…

1 0

[cwittich] 43746: partially sync kernel32 profile to wine 1.1.32
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 18:28:35 2009 New Revision: 43746 URL: http://svn.reactos.org/svn/reactos?rev=43746&view=rev Log: partially sync kernel32 profile to wine 1.1.32 Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Sun Oct 25 18:28:35 2009 @@ -126,7 +126,6 @@ if (quote && (len >= (int)wcslen(value))) buffer[wcslen(buffer)-1] = '\0'; } - /* byte-swaps shorts in-place in a buffer. len is in WCHARs */ static __inline void PROFILE_ByteSwapShortBuffer(WCHAR * buffer, int len) { @@ -135,7 +134,6 @@ for (i = 0; i < len; i++) shortbuffer[i] = RtlUshortByteSwap(shortbuffer[i]); } - /* writes any necessary encoding marker to the file */ static __inline void PROFILE_WriteMarker(HANDLE hFile, ENCODING encoding) @@ -344,7 +342,6 @@ DPRINT("Error %ld reading file\n", GetLastError()); return NULL; } - len = dwFileSize; *pEncoding = PROFILE_DetectTextEncoding(buffer_base, &len); /* len is set to the number of bytes in the character marker. @@ -431,8 +428,7 @@ while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) szLineStart++; while ((szLineEnd > szLineStart) && PROFILE_isspaceW(szLineEnd[-1])) szLineEnd--; - if (szLineStart >= szLineEnd) - continue; + if (szLineStart >= szLineEnd) continue; if (*szLineStart == '[') /* section start */ { @@ -888,12 +884,11 @@ * If return_values is TRUE, also include the corresponding values. */ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, - LPWSTR buffer, UINT len, BOOL return_values, BOOL return_noequalkeys ) + LPWSTR buffer, UINT len, BOOL return_values ) { PROFILEKEY *key; - if (!buffer) - return 0; + if(!buffer) return 0; DPRINT("%S,%p,%u\n", section_name, buffer, len); @@ -907,7 +902,7 @@ if (len <= 2) break; if (!*key->name) continue; /* Skip empty lines */ if (IS_ENTRY_COMMENT(key->name)) continue; /* Skip comments */ - if (!return_noequalkeys && !return_values && !key->value) continue; /* Skip lines w.o. '=' */ + if (!return_values && !key->value) continue; /* Skip lines w.o. '=' */ PROFILE_CopyEntry( buffer, key->name, len - 1, 0 ); len -= wcslen(buffer) + 1; buffer += wcslen(buffer) + 1; @@ -1032,7 +1027,7 @@ /* no "else" here ! */ if (section && section[0]) { - INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE, !win32); + INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE); if (!buffer[0]) /* no luck -> def_val */ { PROFILE_CopyEntry(buffer, def_val, len, TRUE); @@ -1303,19 +1298,15 @@ filename ))) return def_val; - if (len+1 == sizeof(buffer)/sizeof(WCHAR)) - DPRINT1("result may be wrong!\n"); - /* FIXME: if entry can be found but it's empty, then Win16 is * supposed to return 0 instead of def_val ! Difficult/problematic * to implement (every other failure also returns zero buffer), * thus wait until testing framework avail for making sure nothing * else gets broken that way. */ - if (!buffer[0]) - return (UINT)def_val; + if (!buffer[0]) return (UINT)def_val; RtlInitUnicodeString( &bufferW, buffer ); - RtlUnicodeStringToInteger( &bufferW, 0, &result); // 10 + RtlUnicodeStringToInteger( &bufferW, 0, &result); return result; } @@ -1362,7 +1353,7 @@ RtlEnterCriticalSection( &PROFILE_CritSect ); if (PROFILE_Open( filename, FALSE )) - ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE, FALSE); + ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1385,7 +1376,7 @@ return 0; } - bufferW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + bufferW = HeapAlloc(GetProcessHeap(), 0, len * 2 * sizeof(WCHAR)); if (!bufferW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1396,18 +1387,18 @@ if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retW = GetPrivateProfileSectionW(sectionW.Buffer, bufferW, len, filenameW.Buffer); - if (len > 2) - { + retW = GetPrivateProfileSectionW(sectionW.Buffer, bufferW, len * 2, filenameW.Buffer); + if (retW) + { + if (retW == len * 2 - 2) retW++; /* overflow */ ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 1, buffer, len, NULL, NULL); - if (ret > 2) - ret -= 1; - else - { - ret = 0; + if (!ret || ret == len) /* overflow */ + { + ret = len - 2; buffer[len-2] = 0; buffer[len-1] = 0; } + else ret--; } else { @@ -1513,7 +1504,7 @@ { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } - } + } else if (PROFILE_Open( filename, TRUE )) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); @@ -1663,10 +1654,8 @@ INT retW, ret = 0; bufferW = buffer ? HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)) : NULL; - if (filename) - RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); - else - filenameW.Buffer = NULL; + if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); + else filenameW.Buffer = NULL; retW = GetPrivateProfileSectionNamesW(bufferW, size, filenameW.Buffer); if (retW && size) @@ -1794,6 +1783,7 @@ } + /*********************************************************************** * WritePrivateProfileStructW (KERNEL32.@) */ @@ -1841,7 +1831,6 @@ return ret; } - /*********************************************************************** * WritePrivateProfileStructA (KERNEL32.@)

1 0

[gschneider] 43745: [win32k] GetTransform: - Add support for more transforms - Fix return value for invalid/unsupported transform types - Fixes 10 gdi32 mapping winetests
by gschneider＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: gschneider Date: Sun Oct 25 18:23:19 2009 New Revision: 43745 URL: http://svn.reactos.org/svn/reactos?rev=43745&view=rev Log: [win32k] GetTransform: - Add support for more transforms - Fix return value for invalid/unsupported transform types - Fixes 10 gdi32 mapping winetests Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun Oct 25 18:23:19 2009 @@ -163,6 +163,9 @@ } GDILOOBJTYPE, *PGDILOOBJTYPE; #define GdiWorldSpaceToPageSpace 0x203 +#define GdiWorldSpaceToDeviceSpace 0x204 +#define GdiPageSpaceToDeviceSpace 0x304 +#define GdiDeviceSpaceToWorldSpace 0x402 /* FIXME: Unknown */ typedef DWORD FULLSCREENCONTROL; Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Oct 25 18:23:19 2009 @@ -198,7 +198,17 @@ MatrixS2XForm(XForm, &dc->dclevel.mxWorldToPage); break; + case GdiWorldSpaceToDeviceSpace: + MatrixS2XForm(XForm, &dc->dclevel.mxWorldToDevice); + break; + + case GdiDeviceSpaceToWorldSpace: + MatrixS2XForm(XForm, &dc->dclevel.mxDeviceToWorld); + break; + default: + DPRINT1("Unknown or unsupported transform %lu\n", iXform); + Status = STATUS_INVALID_PARAMETER; break; } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs