July 2006 - Wine-Commits - list.winehq.org

Jason Green : wined3d: Fix minor typo from shader patch.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 0312a306762d03b3b94c9e44e1969f3f214aaaed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0312a306762d03b3b94c9e4… Author: Jason Green <jave27(a)gmail.com> Date: Thu Jul 27 07:59:03 2006 -0400 wined3d: Fix minor typo from shader patch. --- dlls/wined3d/vertexshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 923f953..7e29e72 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -763,7 +763,7 @@ #endif * Account for any inverted textures (render to texture case) by reversing the y coordinate * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) */ shader_addline(&buffer, "MOV result.position, TMP_OUT;\n"); - shader_addline(&buffer, "MUL result.position.y, TMP_OUT.y, state.matrix.projection.row[1].y;\n"); + shader_addline(&buffer, "MUL result.position.y, TMP_OUT.y, PROJECTION.y;\n"); shader_addline(&buffer, "END\n\0");

1 0

Huw Davies : wine.inf: Add lnkfile description.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: e7eeb67a7cbc9173e885f87ec6cbefdcf8a76ec4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7eeb67a7cbc9173e885f87… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 27 12:23:45 2006 +0100 wine.inf: Add lnkfile description. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index f894c39..077f68e 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -107,6 +107,7 @@ HKCR,folder\shell\open\ddeexec\applicati HKCR,htmlfile\shell\open\command,,,"winebrowser" HKCR,inifile\shell\open\command,,,"%11%\notepad.exe %1" HKCR,inifile\shell\print\command,,,"%11%\notepad.exe /p %1" +HKCR,lnkfile,,,"Shortcut" HKCR,lnkfile,"NeverShowExt",,"" HKCR,lnkfile,"IsShortcut",,"yes" HKCR,lnkfile\CLSID,,,"{00021401-0000-0000-C000-000000000046}"

1 0

Alexandre Julliard : server: Round up the timeout for poll() to avoid redundant calls.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 4d1d49b78a731abe46986cfae0083154d3c578b8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d1d49b78a731abe46986cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 27 14:39:50 2006 +0200 server: Round up the timeout for poll() to avoid redundant calls. --- server/fd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/fd.c b/server/fd.c index 319f55c..6df422e 100644 --- a/server/fd.c +++ b/server/fd.c @@ -516,7 +516,7 @@ static int get_next_timeout(void) { struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); int diff = (timeout->when.tv_sec - now.tv_sec) * 1000 - + (timeout->when.tv_usec - now.tv_usec) / 1000; + + (timeout->when.tv_usec - now.tv_usec + 999) / 1000; if (diff < 0) diff = 0; return diff; }

1 0

Alexandre Julliard : server: Don't crash on invalid request sizes.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 552244684884ba85a38a1ec65d30fc1133d313b8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=552244684884ba85a38a1ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 27 14:39:33 2006 +0200 server: Don't crash on invalid request sizes. --- server/request.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/server/request.c b/server/request.c index d0e1a88..765ec7a 100644 --- a/server/request.c +++ b/server/request.c @@ -318,7 +318,11 @@ void read_request( struct thread *thread return; } if (!(thread->req_data = malloc( thread->req_toread ))) - fatal_protocol_error( thread, "no memory for %d bytes request\n", thread->req_toread ); + { + fatal_protocol_error( thread, "no memory for %u bytes request %d\n", + thread->req_toread, thread->req.request_header.req ); + return; + } } /* read the variable sized data */

1 0

Andrew Talbot : user/tests: Write-strings warnings fix.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: aa57a0b939f304dcee7122e08d4265375e51cedf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa57a0b939f304dcee7122e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jul 26 22:22:05 2006 +0100 user/tests: Write-strings warnings fix. --- dlls/user/tests/menu.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index 3dadbb3..23fb1e8 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -24,6 +24,7 @@ #define NONAMELESSSTRUCT #include <stdlib.h> #include <stdarg.h> #include <stdio.h> +#include <string.h> #include <assert.h> #include "windef.h" @@ -75,7 +76,7 @@ #define MOD_NRMENUS 8 /* menu texts with their sizes */ static struct { - char *text; + LPCSTR text; SIZE size; /* size of text up to any \t */ SIZE sc_size; /* size of the short-cut */ } MOD_txtsizes[] = { @@ -324,13 +325,14 @@ static void test_menu_ownerdraw(void) /* helper for test_menu_bmp_and_string() */ static void test_mbs_help( int ispop, int hassub, int mnuopt, HWND hwnd, int arrowwidth, int count, HBITMAP hbmp, - SIZE bmpsize, char *text, SIZE size, SIZE sc_size) + SIZE bmpsize, LPCSTR text, SIZE size, SIZE sc_size) { BOOL ret; HMENU hmenu, submenu; MENUITEMINFO mii={ sizeof( MENUITEMINFO )}; MENUINFO mi; RECT rc; + CHAR text_copy[16]; int hastab, expect; int failed = 0; @@ -344,7 +346,8 @@ static void test_mbs_help( int ispop, in if( text ) { char *p; mii.fMask |= MIIM_STRING; - mii.dwTypeData = text; + strcpy(text_copy, text); + mii.dwTypeData = text_copy; /* structure member declared non-const */ if( ( p = strchr( text, '\t'))) { hastab = *(p + 1) ? 2 : 1; }

1 0

Andrew Talbot : winhelp: Write-strings warning fix.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 8abef9ea50b174e355cef29243e61923d4fa993e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8abef9ea50b174e355cef29… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jul 26 20:30:30 2006 +0100 winhelp: Write-strings warning fix. --- programs/winhelp/winhelp.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index fd4cdd1..bec8a62 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -164,11 +164,12 @@ int PASCAL WinMain(HINSTANCE hInstance, MSG msg; LONG lHash = 0; HLPFILE* hlpfile; - char* wndname = "main"; + static CHAR default_wndname[] = "main"; + LPSTR wndname = default_wndname; WINHELP_DLL* dll; Globals.hInstance = hInstance; - + /* Get options */ while (*cmdline && (*cmdline == ' ' || *cmdline == '-')) {

1 0

James Hawkins : msi: Download the MSI package if it is a remote URL.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: d1617bea17b8614303ef5b19851e18f25b66a250 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d1617bea17b8614303ef5b1… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 26 14:54:15 2006 -0700 msi: Download the MSI package if it is a remote URL. --- dlls/msi/Makefile.in | 2 +- dlls/msi/package.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 4bd23e8..fe12586 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msi.dll IMPORTLIB = libmsi.$(IMPLIBEXT) -IMPORTS = comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 +IMPORTS = urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f3278c1..53433d0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -35,6 +35,8 @@ #include "msiquery.h" #include "objidl.h" #include "wincrypt.h" #include "winuser.h" +#include "wininet.h" +#include "urlmon.h" #include "shlobj.h" #include "wine/unicode.h" #include "objbase.h" @@ -452,6 +454,38 @@ static LPCWSTR copy_package_to_temp( LPC return filename; } +static LPCWSTR msi_download_package( LPCWSTR szUrl, LPWSTR filename ) +{ + LPINTERNET_CACHE_ENTRY_INFOW cache_entry; + DWORD size = 0; + HRESULT hr; + + /* call will always fail, becase size is 0, + * but will return ERROR_FILE_NOT_FOUND first + * if the file doesn't exist + */ + GetUrlCacheEntryInfoW( szUrl, NULL, &size ); + if ( GetLastError() != ERROR_FILE_NOT_FOUND ) + { + cache_entry = HeapAlloc( GetProcessHeap(), 0, size ); + if ( !GetUrlCacheEntryInfoW( szUrl, cache_entry, &size ) ) + { + HeapFree( GetProcessHeap(), 0, cache_entry ); + return szUrl; + } + + lstrcpyW( filename, cache_entry->lpszLocalFileName ); + HeapFree( GetProcessHeap(), 0, cache_entry ); + return filename; + } + + hr = URLDownloadToCacheFileW( NULL, szUrl, filename, MAX_PATH, 0, NULL ); + if ( FAILED(hr) ) + return szUrl; + + return filename; +} + UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { MSIDATABASE *db = NULL; @@ -471,7 +505,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, else { WCHAR temppath[MAX_PATH]; - LPCWSTR file = copy_package_to_temp( szPackage, temppath ); + LPCWSTR file; + + if ( UrlIsW( szPackage, URLIS_URL ) ) + file = msi_download_package( szPackage, temppath ); + else + file = copy_package_to_temp( szPackage, temppath ); r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db );

1 0

Juan Lang : crypt32: Implement CryptStrToNameA/W, with tests.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 3882b4f66ad2ee2a225a7365559a97ff7ac48678 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3882b4f66ad2ee2a225a736… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 26 10:57:32 2006 -0700 crypt32: Implement CryptStrToNameA/W, with tests. --- dlls/crypt32/crypt32.spec | 4 dlls/crypt32/str.c | 373 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/str.c | 171 +++++++++++++++++++++ 3 files changed, 546 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3882b4f66ad2ee2a225…

1 0

Juan Lang : crypt32: Implement X509_UNICODE_NAME encoding/decoding.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 8ccbdb801e425d4ef40380fa2ff8d88b502114c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ccbdb801e425d4ef40380f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 26 07:44:47 2006 -0700 crypt32: Implement X509_UNICODE_NAME encoding/decoding. --- dlls/crypt32/decode.c | 108 +++++++++-- dlls/crypt32/encode.c | 419 +++++++++++++++++++++++++++---------------- dlls/crypt32/tests/encode.c | 184 +++++++++++++++++++ 3 files changed, 536 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8ccbdb801e425d4ef40…

1 0

Alexandre Julliard : oleaut32: Fixed compiler warning.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 06fbe6012ffee4d256e58ef35490c8fac79e7b1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06fbe6012ffee4d256e58ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 27 12:03:33 2006 +0200 oleaut32: Fixed compiler warning. --- dlls/oleaut32/olefont.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index af18428..87848c6 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1427,7 +1427,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke } if (pDispParams->cArgs != 1) { - ERR("param count for DISPATCH_PROPERTYPUT was %ld instead of 1\n", pDispParams->cArgs); + ERR("param count for DISPATCH_PROPERTYPUT was %d instead of 1\n", pDispParams->cArgs); return DISP_E_BADPARAMCOUNT; } }

1 0