June 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Only load the surface for partial updates in wined3d_device_update_surface ().
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: 45a0e9596215589acf3b781ae6979fa41d4be7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a0e9596215589acf3b781ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 22:38:25 2011 +0200 wined3d: Only load the surface for partial updates in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 67c38aa..03f57ff 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4833,8 +4833,13 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, checkGLcall("glActiveTextureARB"); LEAVE_GL(); - /* Make sure the surface is loaded and up to date */ - surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); + /* Only load the surface for partial updates. For newly allocated texture + * the texture wouldn't be the current location, and we'd upload zeroes + * just to overwrite them again. */ + if (update_w == dst_w && update_h == dst_h) + surface_prepare_texture(dst_surface, gl_info, FALSE); + else + surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); surface_bind(dst_surface, gl_info, FALSE); data.buffer_object = 0;

1 0

André Hentschel : winebuild: get_asm_ptr_keyword is not needed for ARM.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: cd9ff09d8e3b147c376e68b92560de1c1a522fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9ff09d8e3b147c376e68b92… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 16 22:06:33 2011 +0200 winebuild: get_asm_ptr_keyword is not needed for ARM. --- tools/winebuild/import.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index a2c51ea..b0901a6 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -673,7 +673,7 @@ static void output_import_thunk( const char *name, const char *table, int pos ) case CPU_ARM: output( "\tldr IP,[PC,#0]\n"); output( "\tmov PC,PC\n"); - output( "\t%s %s\n", get_asm_ptr_keyword(), table ); + output( "\t.long %s\n", table ); output( "\tldr PC,[IP,#%d]\n", pos); break; case CPU_POWERPC: @@ -989,7 +989,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmov LR,PC\n"); output( "\tadd LR,LR,#8\n"); output( "\tldr PC,[PC,#-4]\n"); - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name("__wine_spec_delay_load") ); + output( "\t.long %s\n", asm_name("__wine_spec_delay_load") ); output( "\tmov IP,r0\n"); output( "\tldmfd SP!, {r4-r10,FP,LR}\n" ); output( "\tldmfd SP!, {r0-r3}\n" ); @@ -1084,7 +1084,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmov r0, r1\n" ); output( "\tadd r0, #%d\n", j ); output( "\tldr PC,[PC,#-4]\n"); - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name("__wine_delay_load_asm") ); + output( "\t.long %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_POWERPC: switch(target_platform)

1 0

Alexandre Julliard : server: Allow creating a process without any parent or startup info.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: a0c0878805a14f985682626c1379941d99b75159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c0878805a14f985682626c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 22:45:45 2011 +0200 server: Allow creating a process without any parent or startup info. --- server/process.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/server/process.c b/server/process.c index f5430c8..c88c89b 100644 --- a/server/process.c +++ b/server/process.c @@ -886,6 +886,12 @@ DECL_HANDLER(new_process) return; } + if (!req->info_size) /* create an orphaned process */ + { + create_process( socket_fd, NULL, 0 ); + return; + } + /* build the startup info for a new process */ if (!(info = alloc_object( &startup_info_ops ))) return; info->exe_file = NULL;

1 0

Aric Stewart : po: Add a number of missing '\n' characters in translations.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: 0d8e1951d4d8b0987a5766c68846b273a2208256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8e1951d4d8b0987a5766c68… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 16 13:56:05 2011 -0500 po: Add a number of missing '\n' characters in translations. --- po/pl.po | 14 +++++++------- po/sv.po | 4 ++-- po/zh_CN.po | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/po/pl.po b/po/pl.po index 4757f34..c89a475 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-28 19:00+0100\n" +"PO-Revision-Date: 2011-06-16 13:50-0500\n" "Last-Translator: Łukasz Wojniłowicz\n" "Language-Team: none\n" "Language: Polish\n" @@ -3314,7 +3314,7 @@ msgstr "Różne konto usługi\n" #: winerror.mc:1276 msgid "Driver failure cannot be detected\n" -msgstr "Nie można wykryć niepowodzenia sterownika" +msgstr "Nie można wykryć niepowodzenia sterownikai\n" #: winerror.mc:1281 msgid "Process abort cannot be detected\n" @@ -3806,7 +3806,7 @@ msgstr "Wykonaj operację nawet gdy nic się nie zmieniło\n" #: winerror.mc:1896 msgid "The user profile is invalid\n" -msgstr "Profil użytkownika jest niepoprawny." +msgstr "Profil użytkownika jest niepoprawny.\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server\n" @@ -4538,7 +4538,7 @@ msgstr "Instalacja już jest uruchomiona\n" #: winerror.mc:2816 msgid "Installation package failed to open\n" -msgstr "Niepowodzenie przy otwieraniu paczki instalacyjnej" +msgstr "Niepowodzenie przy otwieraniu paczki instalacyjnej\n" #: winerror.mc:2821 msgid "Installation package is invalid\n" @@ -4558,7 +4558,7 @@ msgstr "Język instalacji niewspierany\n" #: winerror.mc:2841 msgid "Installation transform failed to apply\n" -msgstr "Nieudane zastosowanie transformacji instalacji" +msgstr "Nieudane zastosowanie transformacji instalacji\n" #: winerror.mc:2846 msgid "Installation package rejected\n" @@ -4570,7 +4570,7 @@ msgstr "Funkcja nie mogła być wywołana\n" #: winerror.mc:2856 msgid "Function failed\n" -msgstr "Funkcja zakończyła niepowodzeniem" +msgstr "Funkcja zakończyła niepowodzeniem\n" #: winerror.mc:2861 msgid "Invalid table\n" @@ -5218,7 +5218,7 @@ msgstr "Symbol potoku RPC zamknięty\n" #: winerror.mc:3671 msgid "Discipline error on RPC pipe\n" -msgstr "Błąd dyscypliny na symbolu potoku RPC" +msgstr "Błąd dyscypliny na symbolu potoku RPC\n" #: winerror.mc:3676 msgid "No data on RPC pipe\n" diff --git a/po/sv.po b/po/sv.po index 280730a..5e7172b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-18 22:15+02:00\n" +"PO-Revision-Date: 2011-06-16 13:51-0500\n" "Last-Translator: Anders Jonsson <anders.jonsson(a)norsjonet.se>\n" "Language-Team: none\n" "Language: Swedish\n" @@ -4548,7 +4548,7 @@ msgstr "Installationspaketet är ogiltigt\n" #: winerror.mc:2826 msgid "Installer user interface failed\n" -msgstr "Användargränssnittet för installationsprogrammet misslyckades" +msgstr "Användargränssnittet för installationsprogrammet misslyckades\n" #: winerror.mc:2831 msgid "Failed to open installation log file\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5523807..fd0765f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: N/A\n" +"PO-Revision-Date: 2011-06-16 13:52-0500\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: Chinese (PRC)\n" @@ -8273,7 +8273,7 @@ msgstr "" #: cmd.rc:266 msgid "%s: File Not Found\n" -msgstr "找不到文件" +msgstr "找不到文件\n" #: cmd.rc:267 msgid "No help available for %s\n"

1 0

Alexandre Julliard : kernel32: Create an orphaned process in exec_process so that all initialization is done anew in the child process .
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: 1b0d2330c939807121ef4d68627e438da55d1921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0d2330c939807121ef4d686… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 22:46:25 2011 +0200 kernel32: Create an orphaned process in exec_process so that all initialization is done anew in the child process. --- dlls/kernel32/process.c | 189 +++++++++++++++++++++++++++------------------- 1 files changed, 111 insertions(+), 78 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6b8ff99..f3504af 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1786,6 +1786,85 @@ static BOOL terminate_main_thread(void) #endif /*********************************************************************** + * exec_loader + */ +static pid_t exec_loader( LPCWSTR cmd_line, unsigned int flags, int socketfd, + int stdin_fd, int stdout_fd, const char *unixdir, char *winedebug, + const struct binary_info *binary_info, int exec_only ) +{ + pid_t pid; + char *wineloader = NULL; + const char *loader = NULL; + char **argv; + + argv = build_argv( cmd_line, 1 ); + + if (!is_win64 ^ !(binary_info->flags & BINARY_FLAG_64BIT)) + loader = get_alternate_loader( &wineloader ); + + if (exec_only || !(pid = fork())) /* child */ + { + char preloader_reserve[64], socket_env[64]; + + if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) + { + if (!(pid = fork())) + { + int fd = open( "/dev/null", O_RDWR ); + setsid(); + /* close stdin and stdout */ + if (fd != -1) + { + dup2( fd, 0 ); + dup2( fd, 1 ); + close( fd ); + } + } + else if (pid != -1) _exit(0); /* parent */ + } + else + { + if (stdin_fd != -1) dup2( stdin_fd, 0 ); + if (stdout_fd != -1) dup2( stdout_fd, 1 ); + } + + if (stdin_fd != -1) close( stdin_fd ); + if (stdout_fd != -1) close( stdout_fd ); + + /* Reset signals that we previously set to SIG_IGN */ + signal( SIGPIPE, SIG_DFL ); + signal( SIGCHLD, SIG_DFL ); + + sprintf( socket_env, "WINESERVERSOCKET=%u", socketfd ); + sprintf( preloader_reserve, "WINEPRELOADRESERVE=%lx-%lx", + (unsigned long)binary_info->res_start, (unsigned long)binary_info->res_end ); + + putenv( preloader_reserve ); + putenv( socket_env ); + if (winedebug) putenv( winedebug ); + if (wineloader) putenv( wineloader ); + if (unixdir) chdir(unixdir); + + if (argv) + { + do + { + wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); + } +#ifdef __APPLE__ + while (errno == ENOTSUP && exec_only && terminate_main_thread()); +#else + while (0); +#endif + } + _exit(1); + } + HeapFree( GetProcessHeap(), 0, wineloader ); + HeapFree( GetProcessHeap(), 0, argv ); + return pid; +} + +/*********************************************************************** * create_process * * Create a new process. If hFile is a valid handle we have an exe @@ -1801,9 +1880,6 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW HANDLE process_info; WCHAR *env_end; char *winedebug = NULL; - char *wineloader = NULL; - const char *loader = NULL; - char **argv; startup_info_t *startup_info; DWORD startup_info_size; int socketfd[2], stdin_fd = -1, stdout_fd = -1; @@ -1817,12 +1893,42 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW return FALSE; } + /* create the socket for the new process */ + + if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) + { + SetLastError( ERROR_TOO_MANY_OPEN_FILES ); + return FALSE; + } + + if (exec_only) /* things are much simpler in this case */ + { + wine_server_send_fd( socketfd[1] ); + close( socketfd[1] ); + SERVER_START_REQ( new_process ) + { + req->create_flags = flags; + req->socket_fd = socketfd[1]; + req->exe_file = wine_server_obj_handle( hFile ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + + if (ret) exec_loader( cmd_line, flags, socketfd[0], stdin_fd, stdout_fd, unixdir, + winedebug, binary_info, TRUE ); + + close( socketfd[0] ); + return FALSE; + } + RtlAcquirePebLock(); if (!(startup_info = create_startup_info( filename, cmd_line, cur_dir, env, flags, startup, &startup_info_size ))) { RtlReleasePebLock(); + close( socketfd[0] ); + close( socketfd[1] ); return FALSE; } if (!env) env = NtCurrentTeb()->Peb->ProcessParameters->Environment; @@ -1840,16 +1946,6 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW } env_end++; - /* create the socket for the new process */ - - if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) - { - RtlReleasePebLock(); - HeapFree( GetProcessHeap(), 0, winedebug ); - HeapFree( GetProcessHeap(), 0, startup_info ); - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - return FALSE; - } wine_server_send_fd( socketfd[1] ); close( socketfd[1] ); @@ -1901,77 +1997,14 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW HeapFree( GetProcessHeap(), 0, startup_info ); /* create the child process */ - argv = build_argv( cmd_line, 1 ); - - if (!is_win64 ^ !(binary_info->flags & BINARY_FLAG_64BIT)) - loader = get_alternate_loader( &wineloader ); - - if (exec_only || !(pid = fork())) /* child */ - { - char preloader_reserve[64], socket_env[64]; - - if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) - { - if (!(pid = fork())) - { - int fd = open( "/dev/null", O_RDWR ); - setsid(); - /* close stdin and stdout */ - if (fd != -1) - { - dup2( fd, 0 ); - dup2( fd, 1 ); - close( fd ); - } - } - else if (pid != -1) _exit(0); /* parent */ - } - else - { - if (stdin_fd != -1) dup2( stdin_fd, 0 ); - if (stdout_fd != -1) dup2( stdout_fd, 1 ); - } - - if (stdin_fd != -1) close( stdin_fd ); - if (stdout_fd != -1) close( stdout_fd ); - - /* Reset signals that we previously set to SIG_IGN */ - signal( SIGPIPE, SIG_DFL ); - signal( SIGCHLD, SIG_DFL ); - - sprintf( socket_env, "WINESERVERSOCKET=%u", socketfd[0] ); - sprintf( preloader_reserve, "WINEPRELOADRESERVE=%lx-%lx", - (unsigned long)binary_info->res_start, (unsigned long)binary_info->res_end ); - - putenv( preloader_reserve ); - putenv( socket_env ); - if (winedebug) putenv( winedebug ); - if (wineloader) putenv( wineloader ); - if (unixdir) chdir(unixdir); - if (argv) - { - do - { - wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); - } -#ifdef __APPLE__ - while (errno == ENOTSUP && exec_only && terminate_main_thread()); -#else - while (0); -#endif - } - _exit(1); - } - - /* this is the parent */ + pid = exec_loader( cmd_line, flags, socketfd[0], stdin_fd, stdout_fd, unixdir, + winedebug, binary_info, FALSE ); if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd ); close( socketfd[0] ); - HeapFree( GetProcessHeap(), 0, argv ); HeapFree( GetProcessHeap(), 0, winedebug ); - HeapFree( GetProcessHeap(), 0, wineloader ); if (pid == -1) { FILE_SetDosError();

1 0

Austin English : netapi32: Add a stub for DsGetSiteNameA.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: 94ae7ebdaada5e590db0402946d8b76056417e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ae7ebdaada5e590db040294… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 16 12:48:59 2011 -0700 netapi32: Add a stub for DsGetSiteNameA. --- dlls/netapi32/ds.c | 6 ++++++ dlls/netapi32/netapi32.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/ds.c b/dlls/netapi32/ds.c index 386e222..e7bbe9c 100644 --- a/dlls/netapi32/ds.c +++ b/dlls/netapi32/ds.c @@ -58,6 +58,12 @@ DWORD WINAPI DsGetSiteNameW(LPCWSTR ComputerName, LPWSTR *SiteName) return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI DsGetSiteNameA(LPCSTR ComputerName, LPSTR *SiteName) +{ + FIXME("(%s, %p): stub\n", debugstr_a(ComputerName), SiteName); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /************************************************************ * DsRoleFreeMemory (NETAPI32.@) * diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 7905504..28d6427 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -9,8 +9,8 @@ @ stub DsGetDcOpen @ stub DsGetDcSiteCoverage @ stub DsGetForestTrustInformationW -@ stub DsGetSiteNameA # (str str) -@ stdcall DsGetSiteNameW(wstr wstr) +@ stdcall DsGetSiteNameA(str ptr) +@ stdcall DsGetSiteNameW(wstr ptr) @ stub DsMergeForestTrustInformationW @ stdcall DsRoleFreeMemory(ptr) @ stdcall DsRoleGetPrimaryDomainInformation(wstr long ptr)

1 0

Jacek Caban : mshtml: Call on_start_nsrequest synchronously in async_stop_request is no data was read before .
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 17e6d75ed41bf2207c4206adf63ba835d1e06609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e6d75ed41bf2207c4206adf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 16:42:12 2011 +0200 mshtml: Call on_start_nsrequest synchronously in async_stop_request is no data was read before. --- dlls/mshtml/navigate.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2d45f09..6d84d3f 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -689,6 +689,8 @@ HRESULT start_binding(HTMLWindow *window, HTMLDocumentNode *doc, BSCallback *bsc IStream *str = NULL; HRESULT hres; + TRACE("(%p %p %p %p)\n", window, doc, bscallback, bctx); + bscallback->doc = doc; /* NOTE: IE7 calls IsSystemMoniker here*/ @@ -1001,11 +1003,6 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) request_result = NS_ERROR_FAILURE; } - if(!This->bsc.readed && SUCCEEDED(result)) { - TRACE("No data read! Calling OnStartRequest\n"); - on_start_nsrequest(This); - } - if(This->nslistener) { nsres = nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, @@ -1270,6 +1267,11 @@ static HRESULT async_stop_request(nsChannelBSC *This) { stop_request_task_t *task; + if(!This->bsc.readed) { + TRACE("No data read, calling OnStartRequest\n"); + on_start_nsrequest(This); + } + task = heap_alloc(sizeof(*task)); if(!task) return E_OUTOFMEMORY;

1 0

Marcus Meissner : d3dxof: Check returns of read_bytes (Coverity).
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 5ba1f867a1f838e9b88b4247e8fc4839a929aaa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba1f867a1f838e9b88b4247e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 16 17:47:52 2011 +0200 d3dxof: Check returns of read_bytes (Coverity). --- dlls/d3dxof/parsing.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index cbf1761..4acaaba 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -233,8 +233,10 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr) buf->rem_bytes -= sizeof(WORD) * 2; buf->buffer += sizeof(WORD) * 2; - read_bytes(buf, &decomp_size, sizeof(decomp_size)); - read_bytes(buf, &comp_size, sizeof(comp_size)); + if (!read_bytes(buf, &decomp_size, sizeof(decomp_size))) + return DXFILEERR_BADFILETYPE; + if (!read_bytes(buf, &comp_size, sizeof(comp_size))) + return DXFILEERR_BADFILETYPE; TRACE("Compressed format %s detected: compressed_size = %x, decompressed_size = %x\n", debugstr_fourcc(header[2]), comp_size, decomp_size); @@ -1049,7 +1051,8 @@ static void go_to_next_definition(parse_buffer * buf) char c; while (buf->rem_bytes) { - read_bytes(buf, &c, 1); + if (!read_bytes(buf, &c, 1)) + return; if ((c == '#') || (c == '/')) { /* Handle comment (# or //) */

1 0

Aric Stewart : usp10: Refine post-matra Ralf reordering to be post below form consonants as well .
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 75520505de39555af87b9f4e1911bff224da638f URL: http://source.winehq.org/git/wine.git/?a=commit;h=75520505de39555af87b9f4e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 16 11:28:43 2011 -0500 usp10: Refine post-matra Ralf reordering to be post below form consonants as well. --- dlls/usp10/indic.c | 9 ++++++++- dlls/usp10/shape.c | 14 ++++++++++++-- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index 09de3b5..82ef2c1 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -238,6 +238,7 @@ static BOOL Consonent_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, IndicSyllable *s, lexical_function lex) { int i; + BOOL blwf = FALSE; /* remove ralf from consideration */ if (Consonent_is_ralf(hdc, psa, psc, input, s, lex)) @@ -257,8 +258,10 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP } } - while (Consonent_is_below_base_form(hdc, psa, psc, input, s, lex) || Consonent_is_post_base_form(hdc, psa, psc, input, s, lex) || Consonent_is_pre_base_form(hdc, psa, psc, input, s, lex)) + while ((blwf = Consonent_is_below_base_form(hdc, psa, psc, input, s, lex)) || Consonent_is_post_base_form(hdc, psa, psc, input, s, lex) || Consonent_is_pre_base_form(hdc, psa, psc, input, s, lex)) { + if (blwf && s->blwf == -1) + s->blwf = s->base - 1; for (i = s->base-1; i >= s->start; i--) if (is_consonant( lex(input[i]) )) { @@ -270,6 +273,9 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP if (s->ralf >= 0) s->start = s->ralf; + if (s->ralf == s->base) + s->ralf = -1; + return s->base; } @@ -303,6 +309,7 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L (*syllables)[*syllable_count].start = index; (*syllables)[*syllable_count].base = center; (*syllables)[*syllable_count].ralf = -1; + (*syllables)[*syllable_count].blwf = -1; (*syllables)[*syllable_count].end = next-1; FindBaseConsonant(hdc, psa, psc, input, &(*syllables)[*syllable_count], lex); reorder_f(input, &(*syllables)[*syllable_count], lex); diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c8f11db..b114618 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1767,9 +1767,10 @@ static void Reorder_Ra_follows_matra(LPWSTR pwChar, IndicSyllable *s, lexical_fu if (s->ralf >= 0) { int j,loc; + int stop = (s->blwf >=0)? s->blwf+1 : s->base; WORD Ra = pwChar[s->start]; WORD H = pwChar[s->start+1]; - for (loc = s->end; loc > s->base; loc--) + for (loc = s->end; loc > stop; loc--) if (lexical(pwChar[loc]) == lex_Matra_post || lexical(pwChar[loc]) == lex_Matra_below) break; @@ -1781,6 +1782,7 @@ static void Reorder_Ra_follows_matra(LPWSTR pwChar, IndicSyllable *s, lexical_fu s->ralf = loc-1; s->base -= 2; + if (s->blwf >= 0) s->blwf -= 2; } } @@ -1800,6 +1802,7 @@ static void Reorder_Ra_follows_syllable(LPWSTR pwChar, IndicSyllable *s, lexical s->ralf = s->end-1; s->base -= 2; + if (s->blwf >= 0) s->blwf -= 2; } } @@ -1822,6 +1825,7 @@ static void Reorder_Matra_precede_base(LPWSTR pwChar, IndicSyllable *s, lexical_ pwChar[s->base] = c; if (s->ralf >= s->base) s->ralf++; + if (s->blwf >= s->base) s->blwf++; s->base ++; } } @@ -1847,6 +1851,7 @@ static void Reorder_Matra_precede_syllable(LPWSTR pwChar, IndicSyllable *s, lexi pwChar[s->start] = c; if (s->ralf >= 0) s->ralf++; + if (s->blwf >= 0) s->blwf++; s->base ++; } } @@ -1916,6 +1921,8 @@ static inline void shift_syllable_glyph_indexs(IndicSyllable *glyph_index, INT i glyph_index->end+= shift; if (glyph_index->ralf > index) glyph_index->ralf+= shift; + if (glyph_index->blwf > index) + glyph_index->blwf+= shift; } static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllable, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, IndicSyllable *glyph_index, const GSUB_Feature *feature ) @@ -2014,7 +2021,10 @@ static void Apply_Indic_PostBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa count = syllable->end - syllable->base; - g_offset = 0; + if (syllable->ralf >= syllable->base) + g_offset = -1; + else + g_offset = 0; index = find_halant_consonant(&pwChars[syllable->base], 0, count, lexical); while (index >= 0) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 2b70697..00d9583 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -100,6 +100,7 @@ typedef struct { INT start; INT base; INT ralf; + INT blwf; INT end; } IndicSyllable;

1 0

Vincas Miliūnas : include: Added raw input constants and a missing function prototype.
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: be5f35534b5e2b4203adee71a192b593e40cda8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5f35534b5e2b4203adee71a… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Wed Jun 15 10:44:31 2011 +0300 include: Added raw input constants and a missing function prototype. --- include/winuser.h | 104 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 92 insertions(+), 12 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index a8b2c93..a6ff3db 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -556,6 +556,83 @@ typedef struct tagRID_DEVICE_INFO { } DUMMYUNIONNAME; } RID_DEVICE_INFO, *PRID_DEVICE_INFO, *LPRID_DEVICE_INFO; +#define GET_RAWINPUT_CODE_WPARAM(wParam) ((wParam) & 0xff) + +#define RIM_INPUT 0 +#define RIM_INPUTSINK 1 + +#define RIM_TYPEMOUSE 0 +#define RIM_TYPEKEYBOARD 1 +#define RIM_TYPEHID 2 + +#define RI_MOUSE_LEFT_BUTTON_DOWN 0x0001 +#define RI_MOUSE_LEFT_BUTTON_UP 0x0002 +#define RI_MOUSE_RIGHT_BUTTON_DOWN 0x0004 +#define RI_MOUSE_RIGHT_BUTTON_UP 0x0008 +#define RI_MOUSE_MIDDLE_BUTTON_DOWN 0x0010 +#define RI_MOUSE_MIDDLE_BUTTON_UP 0x0020 + +#define RI_MOUSE_BUTTON_1_DOWN RI_MOUSE_LEFT_BUTTON_DOWN +#define RI_MOUSE_BUTTON_1_UP RI_MOUSE_LEFT_BUTTON_UP +#define RI_MOUSE_BUTTON_2_DOWN RI_MOUSE_RIGHT_BUTTON_DOWN +#define RI_MOUSE_BUTTON_2_UP RI_MOUSE_RIGHT_BUTTON_UP +#define RI_MOUSE_BUTTON_3_DOWN RI_MOUSE_MIDDLE_BUTTON_DOWN +#define RI_MOUSE_BUTTON_3_UP RI_MOUSE_MIDDLE_BUTTON_UP + +#define RI_MOUSE_BUTTON_4_DOWN 0x0040 +#define RI_MOUSE_BUTTON_4_UP 0x0080 +#define RI_MOUSE_BUTTON_5_DOWN 0x0100 +#define RI_MOUSE_BUTTON_5_UP 0x0200 +#define RI_MOUSE_WHEEL 0x0400 +#define RI_MOUSE_HORIZONTAL_WHEEL 0x0800 + +#define MOUSE_MOVE_RELATIVE 0x00 +#define MOUSE_MOVE_ABSOLUTE 0x01 +#define MOUSE_VIRTUAL_DESKTOP 0x02 +#define MOUSE_ATTRIBUTES_CHANGED 0x04 +#define MOUSE_MOVE_NOCOALESCE 0x08 + +#define KEYBOARD_OVERRUN_MAKE_CODE 0xFF + +#define RI_KEY_MAKE 0x00 +#define RI_KEY_BREAK 0x01 +#define RI_KEY_E0 0x02 +#define RI_KEY_E1 0x04 +#define RI_KEY_TERMSRV_SET_LED 0x08 +#define RI_KEY_TERMSRV_SHADOW 0x10 + +#define RAWINPUT_ALIGN(x) (((x) + sizeof(DWORD_PTR) - 1) & ~(sizeof(DWORD_PTR) - 1)) +#define NEXTRAWINPUTBLOCK(ptr) ((PRAWINPUT)RAWINPUT_ALIGN((ULONG_PTR)((PBYTE)(ptr) + (ptr)->header.dwSize))) + +#define RID_INPUT 0x10000003 +#define RID_HEADER 0x10000005 + +#define RIDI_PREPARSEDDATA 0x20000005 +#define RIDI_DEVICENAME 0x20000007 +#define RIDI_DEVICEINFO 0x2000000b + +#define RIDEV_REMOVE 0x00000001 +#define RIDEV_EXCLUDE 0x00000010 +#define RIDEV_PAGEONLY 0x00000020 +#define RIDEV_NOLEGACY 0x00000030 +#define RIDEV_INPUTSINK 0x00000100 +#define RIDEV_CAPTUREMOUSE 0x00000200 +#define RIDEV_NOHOTKEYS 0x00000200 +#define RIDEV_APPKEYS 0x00000400 +#define RIDEV_EXINPUTSINK 0x00001000 +#define RIDEV_DEVNOTIFY 0x00002000 +#define RIDEV_EXMODEMASK 0x000000F0 + +#define RIDEV_EXMODE(mode) ((mode) & RIDEV_EXMODEMASK) + +#define GIDC_ARRIVAL 1 +#define GIDC_REMOVAL 2 + +#if (_WIN32_WINNT >= 0x0601) +#define GET_DEVICE_CHANGE_WPARAM(wParam) (LOWORD(wParam)) +#elif (_WIN32_WINNT >= 0x0501) +#define GET_DEVICE_CHANGE_LPARAM(lParam) (LOWORD(lParam)) +#endif typedef struct tagGUITHREADINFO { @@ -2870,18 +2947,20 @@ typedef struct tagCBTACTIVATESTRUCT #define KEYEVENTF_SCANCODE 0x0008 /* mouse_event flags */ -#define MOUSEEVENTF_MOVE 0x0001 -#define MOUSEEVENTF_LEFTDOWN 0x0002 -#define MOUSEEVENTF_LEFTUP 0x0004 -#define MOUSEEVENTF_RIGHTDOWN 0x0008 -#define MOUSEEVENTF_RIGHTUP 0x0010 -#define MOUSEEVENTF_MIDDLEDOWN 0x0020 -#define MOUSEEVENTF_MIDDLEUP 0x0040 -#define MOUSEEVENTF_XDOWN 0x0080 -#define MOUSEEVENTF_XUP 0x0100 -#define MOUSEEVENTF_WHEEL 0x0800 -#define MOUSEEVENTF_HWHEEL 0x1000 -#define MOUSEEVENTF_ABSOLUTE 0x8000 +#define MOUSEEVENTF_MOVE 0x0001 +#define MOUSEEVENTF_LEFTDOWN 0x0002 +#define MOUSEEVENTF_LEFTUP 0x0004 +#define MOUSEEVENTF_RIGHTDOWN 0x0008 +#define MOUSEEVENTF_RIGHTUP 0x0010 +#define MOUSEEVENTF_MIDDLEDOWN 0x0020 +#define MOUSEEVENTF_MIDDLEUP 0x0040 +#define MOUSEEVENTF_XDOWN 0x0080 +#define MOUSEEVENTF_XUP 0x0100 +#define MOUSEEVENTF_WHEEL 0x0800 +#define MOUSEEVENTF_HWHEEL 0x1000 +#define MOUSEEVENTF_MOVE_NOCOALESCE 0x2000 +#define MOUSEEVENTF_VIRTUALDESK 0x4000 +#define MOUSEEVENTF_ABSOLUTE 0x8000 /* ExitWindows() flags */ #define EW_RESTARTWINDOWS 0x0042 @@ -4688,6 +4767,7 @@ WINUSERAPI UINT WINAPI GetRawInputDeviceInfoA(HANDLE,UINT,LPVOID,PUINT); WINUSERAPI UINT WINAPI GetRawInputDeviceInfoW(HANDLE,UINT,LPVOID,PUINT); #define GetRawInputDeviceInfo WINELIB_NAME_AW(GetRawInputDeviceInfo) WINUSERAPI UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST,PUINT,UINT); +WINUSERAPI UINT WINAPI GetRegisteredRawInputDevices(PRAWINPUTDEVICE,PUINT,UINT); WINUSERAPI BOOL WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*); WINUSERAPI HMENU WINAPI GetMenu(HWND); WINUSERAPI BOOL WINAPI GetMenuBarInfo(HWND,LONG,LONG,PMENUBARINFO);

1 0