May 2008 - Wine-commits - list.winehq.org

James Hawkins : mlang: Only return the locale language name if no country name exists.
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: 94459b88d40bdcb926dcfecd136865350e6643d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94459b88d40bdcb926dcfecd1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed May 21 20:28:16 2008 -0500 mlang: Only return the locale language name if no country name exists. --- dlls/mlang/mlang.c | 3 +++ dlls/mlang/tests/Makefile.in | 2 +- dlls/mlang/tests/mlang.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index a60ad70..2f73f1f 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -704,10 +704,13 @@ static inline INT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) static inline INT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) { INT n = GetLocaleInfoW( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); + INT save = n; if (n) { rfc1766[n - 1] = '-'; n += GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); + if (n == save) + rfc1766[n - 1] = '\0'; LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); return n; } diff --git a/dlls/mlang/tests/Makefile.in b/dlls/mlang/tests/Makefile.in index 0df1440..81b6505 100644 --- a/dlls/mlang/tests/Makefile.in +++ b/dlls/mlang/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = mlang.dll -IMPORTS = uuid ole32 gdi32 kernel32 +IMPORTS = uuid oleaut32 ole32 gdi32 kernel32 CTESTS = \ mlang.c diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index c036f7a..dcb8d7d 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -44,6 +44,17 @@ #define TRACE_2 OutputDebugStringA +static CHAR string1[MAX_PATH], string2[MAX_PATH]; + +#define ok_w2(format, szString1, szString2) \ +\ + if (lstrcmpW(szString1, szString2) != 0) \ + { \ + WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ + WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ + ok(0, format, string1, string2); \ + } + static BOOL (WINAPI *pGetCPInfoExA)(UINT,DWORD,LPCPINFOEXA); static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) @@ -734,6 +745,24 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) ok(lcid == 0x409, "got wrong lcid: %04x\n", lcid); } +static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) +{ + HRESULT hr; + BSTR rfcstr; + LCID lcid; + + static WCHAR kok[] = {'k','o','k',0}; + + hr = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, kok); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid, &rfcstr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok_w2("Expected \"%s\", got \"%s\"n", kok, rfcstr); + + SysFreeString(rfcstr); +} + START_TEST(mlang) { IMultiLanguage2 *iML2 = NULL; @@ -752,6 +781,7 @@ START_TEST(mlang) test_rfc1766(iML2); test_GetLcidFromRfc1766(iML2); + test_GetRfc1766FromLcid(iML2); test_EnumCodePages(iML2, 0); test_EnumCodePages(iML2, MIMECONTF_MIME_LATEST);

1 0

Vitaliy Margolen : wineserver: Add support for long command line options.
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: 67daa7f7608f4012a9cfcb1e2cdc20340710b526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67daa7f7608f4012a9cfcb1e2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed May 21 17:58:58 2008 -0600 wineserver: Add support for long command line options. --- server/main.c | 67 ++++++++++++++++++++++++++-------------------- server/wineserver.man.in | 14 +++++----- 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/server/main.c b/server/main.c index c839c18..a7dfc1c 100644 --- a/server/main.c +++ b/server/main.c @@ -28,6 +28,9 @@ #include <stdlib.h> #include <sys/time.h> #include <unistd.h> +#ifdef HAVE_GETOPT_H +# include <getopt.h> +#endif #include "object.h" #include "file.h" @@ -41,36 +44,48 @@ timeout_t master_socket_timeout = 3 * -TICKS_PER_SEC; /* master socket timeout, const char *server_argv0; /* parse-line args */ -/* FIXME: should probably use getopt, and add a (more complete?) help option */ static void usage(void) { - fprintf(stderr, "\nusage: %s [options]\n\n", server_argv0); - fprintf(stderr, "options:\n"); - fprintf(stderr, " -d<n> set debug level to <n>\n"); - fprintf(stderr, " -f remain in the foreground for debugging\n"); - fprintf(stderr, " -h display this help message\n"); - fprintf(stderr, " -k[n] kill the current wineserver, optionally with signal n\n"); - fprintf(stderr, " -p[n] make server persistent, optionally for n seconds\n"); - fprintf(stderr, " -v display version information and exit\n"); - fprintf(stderr, " -w wait until the current wineserver terminates\n"); + fprintf(stderr, "Usage: %s [options]\n\n", server_argv0); + fprintf(stderr, "Options:\n"); + fprintf(stderr, " -d[n], --debug[=n] set debug level to n or +1 if n not specified\n"); + fprintf(stderr, " -f, --foreground remain in the foreground for debugging\n"); + fprintf(stderr, " -h, --help display this help message\n"); + fprintf(stderr, " -k[n], --kill[=n] kill the current wineserver, optionally with signal n\n"); + fprintf(stderr, " -p[n], --persistent[=n] make server persistent, optionally for n seconds\n"); + fprintf(stderr, " -v, --version display version information and exit\n"); + fprintf(stderr, " -w, --wait wait until the current wineserver terminates\n"); fprintf(stderr, "\n"); } static void parse_args( int argc, char *argv[] ) { - int i, ret; + int ret, optc; + + static struct option long_options[] = + { + {"debug", 2, 0, 'd'}, + {"foreground", 0, 0, 'f'}, + {"help", 0, 0, 'h'}, + {"kill", 2, 0, 'k'}, + {"persistent", 2, 0, 'p'}, + {"version", 0, 0, 'v'}, + {"wait", 0, 0, 'w'}, + { NULL, 0, 0, 0} + }; server_argv0 = argv[0]; - for (i = 1; i < argc; i++) + + while ((optc = getopt_long( argc, argv, "d::fhk::p::vw", long_options, NULL )) != -1) { - if (argv[i][0] == '-') + switch(optc) { - switch(argv[i][1]) - { case 'd': - if (isdigit(argv[i][2])) debug_level = atoi( argv[i] + 2 ); - else debug_level++; + if (optarg && isdigit(*optarg)) + debug_level = atoi( optarg ); + else + debug_level++; break; case 'f': foreground = 1; @@ -80,12 +95,14 @@ static void parse_args( int argc, char *argv[] ) exit(0); break; case 'k': - if (isdigit(argv[i][2])) ret = kill_lock_owner( atoi(argv[i] + 2) ); - else ret = kill_lock_owner(-1); + if (optarg && isdigit(*optarg)) + ret = kill_lock_owner( atoi( optarg ) ); + else + ret = kill_lock_owner(-1); exit( !ret ); case 'p': - if (isdigit(argv[i][2])) - master_socket_timeout = (timeout_t)atoi( argv[i] + 2 ) * -TICKS_PER_SEC; + if (optarg && isdigit(*optarg)) + master_socket_timeout = (timeout_t)atoi( optarg ) * -TICKS_PER_SEC; else master_socket_timeout = TIMEOUT_INFINITE; break; @@ -96,16 +113,8 @@ static void parse_args( int argc, char *argv[] ) wait_for_lock(); exit(0); default: - fprintf( stderr, "wineserver: unknown option '%s'\n", argv[i] ); usage(); exit(1); - } - } - else - { - fprintf( stderr, "wineserver: unknown argument '%s'.\n", argv[i] ); - usage(); - exit(1); } } } diff --git a/server/wineserver.man.in b/server/wineserver.man.in index 330adbd..ae0e19f 100644 --- a/server/wineserver.man.in +++ b/server/wineserver.man.in @@ -16,7 +16,7 @@ useful to start \fBwineserver\fR explicitly with different options, as explained below. .SH OPTIONS .TP -.BI \-d [n] +.BI \-d [n] ,\ --debug [=n] Set the debug level to .I n. 0 means no debugging information, 1 is the normal level, and 2 is for @@ -27,14 +27,14 @@ stderr. \fBwine(1)\fR will automatically set the debug level when starting \fBwineserver\fR if the +server option is set in the WINEDEBUG variable. .TP -.B \-f +.B \-f, --foreground Make the server remain in the foreground for easier debugging, for instance when running it under a debugger. .TP -.B \-h +.B \-h, --help Display a help message. .TP -.BI \-k [n] +.BI \-k [n] ,\ --kill [=n] Kill the currently running .B wineserver, optionally by sending signal \fIn\fR. If no signal is specified, sends @@ -42,7 +42,7 @@ a SIGINT first and then a SIGKILL. The instance of \fBwineserver\fR that is killed is selected based on the WINEPREFIX environment variable. .TP -.BI \-p [n] +.BI \-p [n] ,\ --persistent [=n] Specify the \fBwineserver\fR persistence delay, i.e. the amount of time that the server will keep running when all client processes have terminated. This avoids the cost of shutting down and starting again @@ -50,10 +50,10 @@ when programs are launched in quick succession. The timeout \fIn\fR is in seconds, the default value is 3 seconds. If \fIn\fR is not specified, the server stays around forever. .TP -.B \-v +.B \-v, --version Display version information and exit. .TP -.B \-w +.B \-w, --wait Wait until the currently running .B wineserver terminates.

1 0

Alexandre Julliard : kernel32: Don' t require write access on profile file when only reading.
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: 284335229aff3e694b042cbfe549d5c7190ceb23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=284335229aff3e694b042cbfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 22 12:15:37 2008 +0200 kernel32: Don't require write access on profile file when only reading. --- dlls/kernel32/profile.c | 25 ++++++++------- dlls/kernel32/tests/profile.c | 65 +++++++++++++++++++++++++++++----------- 2 files changed, 60 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index a412e1e..9b6b1a1 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -708,7 +708,7 @@ static void PROFILE_ReleaseFile(void) * * Open a profile file, checking the cached file first. */ -static BOOL PROFILE_Open( LPCWSTR filename ) +static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) { WCHAR windirW[MAX_PATH]; WCHAR buffer[MAX_PATH]; @@ -754,8 +754,9 @@ static BOOL PROFILE_Open( LPCWSTR filename ) TRACE("path: %s\n", debugstr_w(buffer)); - hFile = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(buffer, GENERIC_READ | (write_access ? GENERIC_WRITE : 0), + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if ((hFile == INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_FILE_NOT_FOUND)) { @@ -1104,7 +1105,7 @@ static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) { + if (PROFILE_Open( filename, FALSE )) { if (win32 && (section == NULL)) ret = PROFILE_GetSectionNames(buffer, len); else @@ -1336,7 +1337,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) + if (PROFILE_Open( filename, FALSE )) ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE, FALSE); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1419,12 +1420,12 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, if (!section && !entry && !string) /* documented "file flush" case */ { - if (!filename || PROFILE_Open( filename )) + if (!filename || PROFILE_Open( filename, TRUE )) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open( filename )) + else if (PROFILE_Open( filename, TRUE )) { if (!section) { FIXME("(NULL?,%s,%s,%s)?\n", @@ -1479,12 +1480,12 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, if (!section && !string) { - if (!filename || PROFILE_Open( filename )) + if (!filename || PROFILE_Open( filename, TRUE )) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open( filename )) { + else if (PROFILE_Open( filename, TRUE )) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); PROFILE_FlushFile(); @@ -1607,7 +1608,7 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) + if (PROFILE_Open( filename, FALSE )) ret = PROFILE_GetSectionNames(buffer, size); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1662,7 +1663,7 @@ BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) { + if (PROFILE_Open( filename, FALSE )) { PROFILEKEY *k = PROFILE_Find ( &CurProfile->section, section, key, FALSE, FALSE); if (k) { TRACE("value (at %p): %s\n", k->value, debugstr_w(k->value)); @@ -1782,7 +1783,7 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) { + if (PROFILE_Open( filename, TRUE )) { ret = PROFILE_SetString( section, key, outstring, FALSE); PROFILE_FlushFile(); } diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 54ad6da..cddc9a0 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "wine/test.h" #include "windef.h" @@ -29,7 +30,6 @@ #define SECTION "Test" #define TESTFILE ".\\testwine.ini" #define TESTFILE2 ".\\testwine2.ini" -#define TESTFILE3 ".\\testwine3.ini" struct _profileInt { LPCSTR section; @@ -270,21 +270,25 @@ static void test_profile_sections_names(void) /* If the ini-file has already been opened with CreateFile, WritePrivateProfileString failed in wine with an error ERROR_SHARING_VIOLATION, some testing here */ static void test_profile_existing(void) { + static const char *testfile1 = ".\\winesharing1.ini"; + static const char *testfile2 = ".\\winesharing2.ini"; + static const struct { DWORD dwDesiredAccess; DWORD dwShareMode; - DWORD error; + DWORD write_error; + BOOL read_error; } pe[] = { - {GENERIC_READ, FILE_SHARE_READ, ERROR_SHARING_VIOLATION}, - {GENERIC_READ, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION}, - {GENERIC_WRITE, FILE_SHARE_READ, ERROR_SHARING_VIOLATION}, - {GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION}, - {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, ERROR_SHARING_VIOLATION}, - {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION}, - {GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, 0}, - {GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0}, + {GENERIC_READ, FILE_SHARE_READ, ERROR_SHARING_VIOLATION, FALSE }, + {GENERIC_READ, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION, TRUE }, + {GENERIC_WRITE, FILE_SHARE_READ, ERROR_SHARING_VIOLATION, FALSE }, + {GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION, TRUE }, + {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, ERROR_SHARING_VIOLATION, FALSE }, + {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION, TRUE }, + {GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE }, + {GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE }, /*Thief demo (bug 5024) opens .ini file like this*/ - {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0}, + {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE } }; int i; @@ -295,28 +299,53 @@ static void test_profile_existing(void) for (i=0; i < sizeof(pe)/sizeof(pe[0]); i++) { - h = CreateFile(TESTFILE3, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFile(testfile1, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(INVALID_HANDLE_VALUE != h, "%d: CreateFile failed\n",i); SetLastError(0xdeadbeef); - ret = WritePrivateProfileString(SECTION, KEY, "12345", TESTFILE3); - if (!pe[i].error) + + ret = WritePrivateProfileString(SECTION, KEY, "12345", testfile1); + if (!pe[i].write_error) { ok( ret, "%d: WritePrivateProfileString failed with error %u\n", i, GetLastError() ); CloseHandle(h); - size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, TESTFILE3); + size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); ok( size == 5, "%d: test failed, number of characters copied: %d instead of 5\n", i, size ); } else { DWORD err = GetLastError(); ok( !ret, "%d: WritePrivateProfileString succeeded\n", i ); - if (!ret) ok( err == pe[i].error, "%d: WritePrivateProfileString failed with error %u/%u\n", i, err, pe[i].error ); + if (!ret) + ok( err == pe[i].write_error, "%d: WritePrivateProfileString failed with error %u/%u\n", + i, err, pe[i].write_error ); CloseHandle(h); - size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, TESTFILE3); + size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); ok( !size, "%d: test failed, number of characters copied: %d instead of 0\n", i, size ); } - ok( DeleteFile(TESTFILE3), "delete failed\n" ); + + ok( DeleteFile(testfile1), "delete failed\n" ); + } + + h = CreateFile(testfile2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + sprintf( buffer, "[%s]\r\n%s=123\r\n", SECTION, KEY ); + ok( WriteFile( h, buffer, strlen(buffer), &size, NULL ), "failed to write\n" ); + CloseHandle( h ); + + for (i=0; i < sizeof(pe)/sizeof(pe[0]); i++) + { + h = CreateFile(testfile2, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(INVALID_HANDLE_VALUE != h, "%d: CreateFile failed\n",i); + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStringA(SECTION, KEY, NULL, buffer, MAX_PATH, testfile2); + if (!pe[i].read_error) + ok( ret, "%d: GetPrivateProfileString failed with error %u\n", i, GetLastError() ); + else + ok( !ret, "%d: GetPrivateProfileString succeeded\n", i ); + CloseHandle(h); } + ok( DeleteFile(testfile2), "delete failed\n" ); } START_TEST(profile)

1 0

Maarten Lankhorst : quartz: Initialize some uninitialized variables in the video renderer.
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: 5026c25e053147a7f8ef4d34981eb5c163454e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5026c25e053147a7f8ef4d349… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 21 15:48:32 2008 -0700 quartz: Initialize some uninitialized variables in the video renderer. --- dlls/quartz/videorenderer.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index db80b65..416422c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -511,6 +511,10 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) pVideoRenderer->AutoShow = 1; pVideoRenderer->rtLastStop = -1; ZeroMemory(&pVideoRenderer->filterInfo, sizeof(FILTER_INFO)); + ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); + ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); + ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); + pVideoRenderer->hWndMsgDrain = NULL; /* construct input pin */ piInput.dir = PINDIR_INPUT;

1 0

Maarten Lankhorst : quartz: Do timekeeping in the avi decoder.
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: c4e32aad01372f5624dce37c1d4699f6095d31af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e32aad01372f5624dce37c1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 21 14:33:47 2008 -0700 quartz: Do timekeeping in the avi decoder. Fixes the timestamps generated. --- dlls/quartz/avidec.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index d449662..3f0aed7 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -78,12 +78,13 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, I LPBYTE pbDstStream; DWORD cbSrcStream; LPBYTE pbSrcStream; + LONGLONG tStart, tStop; hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - return hr; + return hr; } cbSrcStream = IMediaSample_GetActualDataLength(pSample); @@ -92,8 +93,8 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, I hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) { - ERR("Unable to retrieve media type\n"); - goto error; + ERR("Unable to retrieve media type\n"); + goto error; } /* Update input size to match sample size */ @@ -124,6 +125,16 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, I if (res != ICERR_OK) ERR("Error occurred during the decompression (%x)\n", res); + + IMediaSample_SetPreroll(pOutSample, (IMediaSample_IsPreroll(pSample) == S_OK)); + IMediaSample_SetDiscontinuity(pOutSample, (IMediaSample_IsDiscontinuity(pSample) == S_OK)); + IMediaSample_SetSyncPoint(pOutSample, (IMediaSample_IsSyncPoint(pSample) == S_OK)); + + if (IMediaSample_GetTime(pSample, &tStart, &tStop) == S_OK) + IMediaSample_SetTime(pOutSample, &tStart, &tStop); + else + IMediaSample_SetTime(pOutSample, NULL, NULL); + hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { ERR("Error sending sample (%x)\n", hr);

1 0

Maarten Lankhorst : quartz: Don't free memory twice in null renderer.
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: 6d7518685e884d0d1a01230e0796cae513aa216c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7518685e884d0d1a01230e0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 21 13:32:53 2008 -0700 quartz: Don't free memory twice in null renderer. _Release already frees it. --- dlls/quartz/nullrenderer.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 4bf2c84..45315f7 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -282,7 +282,6 @@ static ULONG WINAPI NullRendererInner_Release(IUnknown * iface) IPin_Disconnect((IPin *)This->pInputPin); IPin_Release((IPin *)This->pInputPin); - CoTaskMemFree((IPin *)This->pInputPin); This->lpVtbl = NULL; This->csFilter.DebugInfo->Spare[0] = 0;

1 0

Maarten Lankhorst : ntdll: Give earlier notify to valgrind that HeapFree is trying to free some memory .
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: a9a852faa9611bf155d151dab3d1bc943b99fa4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a852faa9611bf155d151dab… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 21 15:29:31 2008 -0700 ntdll: Give earlier notify to valgrind that HeapFree is trying to free some memory. --- dlls/ntdll/heap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 3cd59f7..2b87e10 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1280,8 +1280,10 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) flags |= heapPtr->flags; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); - /* Some sanity checks */ + /* Inform valgrind we are trying to free memory, so it can throw up an error message */ + notify_free( ptr ); + /* Some sanity checks */ pInUse = (ARENA_INUSE *)ptr - 1; if (!(subheap = HEAP_FindSubHeap( heapPtr, pInUse ))) goto error; if ((char *)pInUse < (char *)subheap->base + subheap->headerSize) goto error; @@ -1289,8 +1291,6 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) /* Turn the block into a free block */ - notify_free( ptr ); - HEAP_MakeInUseBlockFree( subheap, pInUse ); if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );

1 0

Lei Zhang : wininet: Send https scheme to proxy server when appropriate.
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: bd58463eda8e94deb75efa393ff7574d02c7e717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd58463eda8e94deb75efa393… Author: Lei Zhang <thestig(a)google.com> Date: Wed May 21 19:04:10 2008 -0700 wininet: Send https scheme to proxy server when appropriate. --- dlls/wininet/http.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a70bcff..119b49b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1263,14 +1263,18 @@ static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req) { static const WCHAR slash[] = { '/',0 }; static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; + static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','d',0 }; WININETHTTPSESSIONW *session = req->lpHttpSession; - size = 15; /* "http://" + sizeof(port#) + ":/\0" */ + size = 16; /* "https://" + sizeof(port#) + ":/\0" */ size += strlenW( session->lpszHostName ) + strlenW( req->lpszPath ); if (!(url = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return NULL; - sprintfW( url, format, session->lpszHostName, session->nHostPort ); + if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) + sprintfW( url, formatSSL, session->lpszHostName, session->nHostPort ); + else + sprintfW( url, format, session->lpszHostName, session->nHostPort ); if (req->lpszPath[0] != '/') strcatW( url, slash ); strcatW( url, req->lpszPath ); }

1 0

Lei Zhang : mshtml: Added ProxyEnable / ProxyServer handling.
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: 09e8a3328943d83c05c977ba21ad8a66577e6fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e8a3328943d83c05c977ba2… Author: Lei Zhang <thestig(a)google.com> Date: Wed May 21 17:43:29 2008 -0700 mshtml: Added ProxyEnable / ProxyServer handling. --- dlls/mshtml/nsembed.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c172e0d..87132f4 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -301,6 +301,65 @@ static void set_lang(nsIPrefBranch *pref) ERR("SetCharPref failed: %08x\n", nsres); } +static void set_proxy(nsIPrefBranch *pref) +{ + char proxy[512]; + char * proxy_port; + int proxy_port_num; + DWORD enabled = 0, res, size, type; + HKEY hkey; + nsresult nsres; + + static const WCHAR proxy_keyW[] = + {'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; + + res = RegOpenKeyW(HKEY_CURRENT_USER, proxy_keyW, &hkey); + if(res != ERROR_SUCCESS) + return; + + size = sizeof(enabled); + res = RegQueryValueExA(hkey, "ProxyEnable", 0, &type, (LPBYTE)&enabled, &size); + if(res != ERROR_SUCCESS || type != REG_DWORD || enabled == 0) + { + RegCloseKey(hkey); + return; + } + + size = sizeof(proxy); + res = RegQueryValueExA(hkey, "ProxyServer", 0, &type, (LPBYTE)proxy, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || type != REG_SZ) + return; + + proxy_port = strchr(proxy, ':'); + if (!proxy_port) + return; + + *proxy_port = 0; + proxy_port_num = atoi(proxy_port + 1); + TRACE("Setting proxy to %s, port %d\n", debugstr_a(proxy), proxy_port_num); + + nsres = nsIPrefBranch_SetIntPref(pref, "network.proxy.type", 1); + if(NS_FAILED(nsres)) + ERR("SetIntPref network.proxy.type failed: %08x\n", nsres); + nsres = nsIPrefBranch_SetCharPref(pref, "network.proxy.http", proxy); + if(NS_FAILED(nsres)) + ERR("SetCharPref network.proxy.http failed: %08x\n", nsres); + nsres = nsIPrefBranch_SetIntPref(pref, "network.proxy.http_port", proxy_port_num); + if(NS_FAILED(nsres)) + ERR("SetIntPref network.proxy.http_port failed: %08x\n", nsres); + nsres = nsIPrefBranch_SetCharPref(pref, "network.proxy.ssl", proxy); + if(NS_FAILED(nsres)) + ERR("SetCharPref network.proxy.ssl failed: %08x\n", nsres); + nsres = nsIPrefBranch_SetIntPref(pref, "network.proxy.ssl_port", proxy_port_num); + if(NS_FAILED(nsres)) + ERR("SetIntPref network.proxy.ssl_port failed: %08x\n", nsres); +} + static void set_bool_pref(nsIPrefBranch *pref, const char *pref_name, BOOL val) { nsresult nsres; @@ -347,6 +406,7 @@ static void set_profile(void) } set_lang(pref); + set_proxy(pref); set_bool_pref(pref, "security.warn_entering_secure", FALSE); set_bool_pref(pref, "security.warn_submit_insecure", FALSE);

1 0

Francois Gouget : wininet/tests: Get the tests running again on Win98.
by Alexandre Julliard 22 May '08

22 May '08

Module: wine Branch: master Commit: 089221fcce3ddfea02f136c31c8c0da20132ed4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=089221fcce3ddfea02f136c31… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 22 10:38:29 2008 +0200 wininet/tests: Get the tests running again on Win98. --- dlls/wininet/tests/urlcache.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 08ffebb..1e0e5b6 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -30,6 +30,9 @@ #define TEST_URL "http://urlcachetest.winehq.org/index.html" +static BOOL (WINAPI *pDeleteUrlCacheEntryA)(LPCSTR); +static BOOL (WINAPI *pUnlockUrlCacheEntryFileA)(LPCSTR,DWORD); + static char filenameA[MAX_PATH + 1]; static void check_cache_entry_infoA(const char *returnedfrom, LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo) @@ -150,16 +153,22 @@ static void test_urlcacheA(void) HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); - ret = UnlockUrlCacheEntryFile(TEST_URL, 0); - ok(ret, "UnlockUrlCacheEntryFile failed with error %d\n", GetLastError()); + if (pUnlockUrlCacheEntryFileA) + { + ret = pUnlockUrlCacheEntryFileA(TEST_URL, 0); + ok(ret, "UnlockUrlCacheEntryFileA failed with error %d\n", GetLastError()); + } /* test Find*UrlCacheEntry functions */ test_find_url_cache_entriesA(); test_GetUrlCacheEntryInfoExA(); - ret = DeleteUrlCacheEntry(TEST_URL); - ok(ret, "DeleteUrlCacheEntry failed with error %d\n", GetLastError()); + if (pDeleteUrlCacheEntryA) + { + ret = pDeleteUrlCacheEntryA(TEST_URL); + ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); + } ret = DeleteFile(filenameA); todo_wine @@ -178,6 +187,10 @@ static void test_FindCloseUrlCache(void) START_TEST(urlcache) { + HMODULE hdll; + hdll = GetModuleHandleA("wininet.dll"); + pDeleteUrlCacheEntryA = (void*)GetProcAddress(hdll, "DeleteUrlCacheEntryA"); + pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA"); test_urlcacheA(); test_FindCloseUrlCache(); }

1 0