August 2007 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Add CERT_ID_XXX defines.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: e7a1e99a763608afe9b7861def2ac33daec953bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a1e99a763608afe9b7861de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 09:46:35 2007 -0700 crypt32: Add CERT_ID_XXX defines. --- include/wincrypt.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 4b4f389..6bffb85 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3064,6 +3064,10 @@ typedef struct _CERT_ID } DUMMYUNIONNAME; } CERT_ID, *PCERT_ID; +#define CERT_ID_ISSUER_SERIAL_NUMBER 1 +#define CERT_ID_KEY_IDENTIFIER 2 +#define CERT_ID_SHA1_HASH 3 + #undef CMSG_DATA /* may be defined by sys/socket.h */ #define CMSG_DATA 1 #define CMSG_SIGNED 2

1 0

Juan Lang : crypt32: Implement encoding OID and directory name alt name entries.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 676c6e5a3648e65cb1afe7af7b6136f4b384c114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=676c6e5a3648e65cb1afe7af7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 09:48:22 2007 -0700 crypt32: Implement encoding OID and directory name alt name entries. --- dlls/crypt32/encode.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index f01b322..729e3eb 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1942,6 +1942,7 @@ static BOOL CRYPT_AsnEncodeAltNameEntry(const CERT_ALT_NAME_ENTRY *entry, { BOOL ret; DWORD dataLen; + BYTE tag; ret = TRUE; switch (entry->dwAltNameChoice) @@ -1949,6 +1950,7 @@ static BOOL CRYPT_AsnEncodeAltNameEntry(const CERT_ALT_NAME_ENTRY *entry, case CERT_ALT_NAME_RFC822_NAME: case CERT_ALT_NAME_DNS_NAME: case CERT_ALT_NAME_URL: + tag = ASN_CONTEXT | (entry->dwAltNameChoice - 1); if (entry->u.pwszURL) { DWORD i; @@ -1968,13 +1970,24 @@ static BOOL CRYPT_AsnEncodeAltNameEntry(const CERT_ALT_NAME_ENTRY *entry, else dataLen = 0; break; + case CERT_ALT_NAME_DIRECTORY_NAME: + tag = ASN_CONTEXT | ASN_CONSTRUCTOR | (entry->dwAltNameChoice - 1); + dataLen = entry->u.DirectoryName.cbData; + break; case CERT_ALT_NAME_IP_ADDRESS: + tag = ASN_CONTEXT | (entry->dwAltNameChoice - 1); dataLen = entry->u.IPAddress.cbData; break; case CERT_ALT_NAME_REGISTERED_ID: - /* FIXME: encode OID */ + { + struct AsnEncodeTagSwappedItem swapped = + { ASN_CONTEXT | (entry->dwAltNameChoice - 1), entry->u.pszRegisteredID, + CRYPT_AsnEncodeOid }; + + return CRYPT_AsnEncodeSwapTag(0, NULL, &swapped, 0, NULL, pbEncoded, + pcbEncoded); + } case CERT_ALT_NAME_OTHER_NAME: - case CERT_ALT_NAME_DIRECTORY_NAME: FIXME("name type %d unimplemented\n", entry->dwAltNameChoice); return FALSE; default: @@ -1997,7 +2010,7 @@ static BOOL CRYPT_AsnEncodeAltNameEntry(const CERT_ALT_NAME_ENTRY *entry, } else { - *pbEncoded++ = ASN_CONTEXT | (entry->dwAltNameChoice - 1); + *pbEncoded++ = tag; CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); pbEncoded += lenBytes; switch (entry->dwAltNameChoice) @@ -2012,6 +2025,9 @@ static BOOL CRYPT_AsnEncodeAltNameEntry(const CERT_ALT_NAME_ENTRY *entry, *pbEncoded++ = (BYTE)entry->u.pwszURL[i]; break; } + case CERT_ALT_NAME_DIRECTORY_NAME: + memcpy(pbEncoded, entry->u.DirectoryName.pbData, dataLen); + break; case CERT_ALT_NAME_IP_ADDRESS: memcpy(pbEncoded, entry->u.IPAddress.pbData, dataLen); break;

1 0

Maarten Lankhorst : winealsa: Don't commit data on Stop and Play.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 3f59856052bb2195e5ea3aaf7af923e27db42ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f59856052bb2195e5ea3aaf7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Aug 2 14:21:17 2007 +0200 winealsa: Don't commit data on Stop and Play. --- dlls/winealsa.drv/dsoutput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index dc03803..87907b3 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -587,7 +587,6 @@ static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwR /* **** */ EnterCriticalSection(&This->pcm_crst); - CommitAll(This); snd_pcm_start(This->pcm); /* **** */ LeaveCriticalSection(&This->pcm_crst); @@ -607,10 +606,11 @@ static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) avail = This->mmap_buflen_frames; snd_pcm_drop(This->pcm); snd_pcm_prepare(This->pcm); + avail = snd_pcm_avail_update(This->pcm); snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &avail); snd_pcm_hw_params_get_format(This->hw_params, &format); snd_pcm_format_set_silence(format, areas->addr, This->mmap_buflen_frames); - This->mmap_pos += snd_pcm_mmap_commit(This->pcm, This->mmap_pos, avail); + snd_pcm_mmap_commit(This->pcm, This->mmap_pos, 0); /* **** */ LeaveCriticalSection(&This->pcm_crst);

1 0

Juan Lang : crypt32: Test encoding/ decoding a couple more alt name entry types.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 9194d60061f60577d21313514bc9537c8c43674d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9194d60061f60577d21313514… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 09:47:54 2007 -0700 crypt32: Test encoding/decoding a couple more alt name entry types. --- dlls/crypt32/tests/encode.c | 72 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 467619a..92dca63 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1291,6 +1291,12 @@ static const BYTE encodedDnsName[] = { 0x30, 0x0c, 0x82, 0x0a, 0x77, 0x69, static const BYTE localhost[] = { 127, 0, 0, 1 }; static const BYTE encodedIPAddr[] = { 0x30, 0x06, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01 }; +static const unsigned char encodedCommonName[] = { + 0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,'J','u','a','n',' ','L','a','n','g',0}; +static const BYTE encodedOidName[] = { 0x30,0x04,0x88,0x02,0x2a,0x03 }; +static const BYTE encodedDirectoryName[] = { +0x30,0x19,0xa4,0x17,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03, +0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00 }; static void test_encodeAltName(DWORD dwEncoding) { @@ -1299,6 +1305,7 @@ static void test_encodeAltName(DWORD dwEncoding) BYTE *buf = NULL; DWORD size = 0; BOOL ret; + char oid[] = "1.2.3"; /* Test with empty info */ ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, @@ -1379,6 +1386,29 @@ static void test_encodeAltName(DWORD dwEncoding) ok(!memcmp(buf, encodedIPAddr, size), "Unexpected value\n"); LocalFree(buf); } + /* Test with OID */ + entry.dwAltNameChoice = CERT_ALT_NAME_REGISTERED_ID; + U(entry).pszRegisteredID = oid; + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + if (buf) + { + ok(size == sizeof(encodedOidName), "Wrong size %d\n", size); + ok(!memcmp(buf, encodedOidName, size), "Unexpected value\n"); + LocalFree(buf); + } + /* Test with directory name */ + entry.dwAltNameChoice = CERT_ALT_NAME_DIRECTORY_NAME; + U(entry).DirectoryName.cbData = sizeof(encodedCommonName); + U(entry).DirectoryName.pbData = (LPBYTE)encodedCommonName; + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + if (buf) + { + ok(size == sizeof(encodedDirectoryName), "Wrong size %d\n", size); + ok(!memcmp(buf, encodedDirectoryName, size), "Unexpected value\n"); + LocalFree(buf); + } } static void test_decodeAltName(DWORD dwEncoding) @@ -1489,6 +1519,46 @@ static void test_decodeAltName(DWORD dwEncoding) sizeof(localhost)), "Unexpected IP address value\n"); LocalFree(buf); } + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedOidName, + sizeof(encodedOidName), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, + &bufSize); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + info = (CERT_ALT_NAME_INFO *)buf; + + ok(info->cAltEntry == 1, "Expected 1 entries, got %d\n", + info->cAltEntry); + ok(info->rgAltEntry[0].dwAltNameChoice == CERT_ALT_NAME_REGISTERED_ID, + "Expected CERT_ALT_NAME_REGISTERED_ID, got %d\n", + info->rgAltEntry[0].dwAltNameChoice); + ok(!strcmp(info->rgAltEntry[0].pszRegisteredID, "1.2.3"), + "Expected OID 1.2.3, got %s\n", info->rgAltEntry[0].pszRegisteredID); + LocalFree(buf); + } + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, + encodedDirectoryName, sizeof(encodedDirectoryName), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + info = (CERT_ALT_NAME_INFO *)buf; + + ok(info->cAltEntry == 1, "Expected 1 entries, got %d\n", + info->cAltEntry); + ok(info->rgAltEntry[0].dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME, + "Expected CERT_ALT_NAME_DIRECTORY_NAME, got %d\n", + info->rgAltEntry[0].dwAltNameChoice); + ok(U(info->rgAltEntry[0]).DirectoryName.cbData == + sizeof(encodedCommonName), "Unexpected directory name length %d\n", + U(info->rgAltEntry[0]).DirectoryName.cbData); + ok(!memcmp(U(info->rgAltEntry[0]).DirectoryName.pbData, + encodedCommonName, sizeof(encodedCommonName)), + "Unexpected directory name value\n"); + LocalFree(buf); + } } struct UnicodeExpectedError @@ -1981,8 +2051,6 @@ static void test_encodeBasicConstraints(DWORD dwEncoding) } static const unsigned char bin63[] = { 0x30,0x06,0x01,0x01,0x01,0x02,0x01,0x01 }; -static const unsigned char encodedCommonName[] = { - 0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,'J','u','a','n',' ','L','a','n','g',0}; static void test_decodeBasicConstraints(DWORD dwEncoding) {

1 0

Juan Lang : crypt32: Get rid of bogus check and improve traces for unexpected alt name entry types .
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 0cb6148422e455406316ea55cef66adc99c0fd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb6148422e455406316ea55c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 09:47:19 2007 -0700 crypt32: Get rid of bogus check and improve traces for unexpected alt name entry types. --- dlls/crypt32/decode.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 022c912..7d7634a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2111,11 +2111,6 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameEntry(DWORD dwCertEncodingType, SetLastError(CRYPT_E_ASN1_CORRUPT); return FALSE; } - if ((pbEncoded[0] & ASN_FLAGS_MASK) != ASN_CONTEXT) - { - SetLastError(CRYPT_E_ASN1_BADTAG); - return FALSE; - } lenBytes = GET_LEN_BYTES(pbEncoded[1]); if (1 + lenBytes > cbEncoded) { @@ -2138,16 +2133,18 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameEntry(DWORD dwCertEncodingType, /* FIXME: decode as OID */ case 0: /* otherName */ case 4: /* directoryName */ - FIXME("stub\n"); + FIXME("%d: stub\n", pbEncoded[0] & ASN_TYPE_MASK); SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; break; case 3: /* x400Address, unimplemented */ case 5: /* ediPartyName, unimplemented */ + TRACE("type %d unimplemented\n", pbEncoded[0] & ASN_TYPE_MASK); SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; break; default: + TRACE("type %d bad\n", pbEncoded[0] & ASN_TYPE_MASK); SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; }

1 0

Maarten Lankhorst : winealsa: Fix Lock in dsoutput.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: decd2d8156e45eabd3a53f224addd90f718a6172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=decd2d8156e45eabd3a53f224… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Aug 2 14:19:05 2007 +0200 winealsa: Fix Lock in dsoutput. --- dlls/winealsa.drv/dsoutput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index f6a2d96..dc03803 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -319,7 +319,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Lock(PIDSDRIVERBUFFER iface, } writepos = snd_pcm_bytes_to_frames(This->pcm, dwWritePosition); - if (writepos == This->mmap_pos && snd_pcm_state(This->pcm) == SND_PCM_STATE_RUNNING) + if (writepos == This->mmap_pos) { const snd_pcm_channel_area_t *areas; snd_pcm_uframes_t writelen = snd_pcm_bytes_to_frames(This->pcm, dwWriteLen), putin = writelen;

1 0

Alexandre Julliard : user32: Store all builtin winprocs at the start of the array.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 0bd1fc4633320e8079f6d0a65597ccde4d510c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd1fc4633320e8079f6d0a65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 2 17:08:48 2007 +0200 user32: Store all builtin winprocs at the start of the array. This allows checking for them in CallWindowProc and avoid message translation in that case. --- dlls/user32/winproc.c | 51 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index c6e49f2..27b31a1 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -53,9 +53,11 @@ typedef struct tagWINDOWPROC #define WINPROC_HANDLE (~0UL >> 16) #define MAX_WINPROCS 8192 +#define BUILTIN_WINPROCS 8 /* first BUILTIN_WINPROCS entries are reserved for builtin procs */ static WINDOWPROC winproc_array[MAX_WINPROCS]; -static UINT winproc_used; +static UINT builtin_used; +static UINT winproc_used = BUILTIN_WINPROCS; static CRITICAL_SECTION winproc_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -83,7 +85,7 @@ static inline WINDOWPROC *find_winproc16( WNDPROC16 func ) { unsigned int i; - for (i = 0; i < winproc_used; i++) + for (i = BUILTIN_WINPROCS; i < winproc_used; i++) { if (winproc_array[i].proc16 == func) return &winproc_array[i]; } @@ -96,13 +98,32 @@ static inline WINDOWPROC *find_winproc( WNDPROC funcA, WNDPROC funcW ) { unsigned int i; - for (i = 0; i < winproc_used; i++) + for (i = 0; i < builtin_used; i++) { /* match either proc, some apps confuse A and W */ if (funcA && winproc_array[i].procA != funcA && winproc_array[i].procW != funcA) continue; if (funcW && winproc_array[i].procA != funcW && winproc_array[i].procW != funcW) continue; return &winproc_array[i]; } + for (i = BUILTIN_WINPROCS; i < winproc_used; i++) + { + if (funcA && winproc_array[i].procA != funcA) continue; + if (funcW && winproc_array[i].procW != funcW) continue; + return &winproc_array[i]; + } + return NULL; +} + +/* find an existing builtin winproc */ +static inline WINDOWPROC *find_builtin_proc( WNDPROC func ) +{ + unsigned int i; + + for (i = 0; i < builtin_used; i++) + { + if (winproc_array[i].procA == func || winproc_array[i].procW == func) + return &winproc_array[i]; + } return NULL; } @@ -136,13 +157,23 @@ static inline WINDOWPROC *alloc_winproc( WNDPROC funcA, WNDPROC funcW ) /* check if we already have a winproc for that function */ if (!(proc = find_winproc( funcA, funcW ))) { - if (winproc_used < MAX_WINPROCS) + if (funcA && funcW) + { + assert( builtin_used < BUILTIN_WINPROCS ); + proc = &winproc_array[builtin_used++]; + proc->procA = funcA; + proc->procW = funcW; + TRACE( "allocated %p for builtin %p/%p (%d/%d used)\n", + proc_to_handle(proc), funcA, funcW, builtin_used, BUILTIN_WINPROCS ); + } + else if (winproc_used < MAX_WINPROCS) { proc = &winproc_array[winproc_used++]; proc->procA = funcA; proc->procW = funcW; - TRACE( "allocated %p for %p/%p (%d/%d used)\n", - proc_to_handle(proc), funcA, funcW, winproc_used, MAX_WINPROCS ); + TRACE( "allocated %p for %c %p (%d/%d used)\n", + proc_to_handle(proc), funcA ? 'A' : 'W', funcA ? funcA : funcW, + winproc_used, MAX_WINPROCS ); } else FIXME( "too many winprocs, cannot allocate one for %p/%p\n", funcA, funcW ); } @@ -2226,7 +2257,7 @@ LRESULT WINAPI CallWindowProcA( if (!func) return 0; - if (!(proc = handle_to_proc( func ))) + if (!(proc = handle_to_proc( func )) && !(proc = find_builtin_proc( func ))) call_window_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc->procA) call_window_proc( hwnd, msg, wParam, lParam, &result, proc->procA ); @@ -2251,7 +2282,7 @@ LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, if (!func) return 0; - if (!(proc = handle_to_proc( func ))) + if (!(proc = handle_to_proc( func )) && !(proc = find_builtin_proc( func ))) call_window_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc->procW) call_window_proc( hwnd, msg, wParam, lParam, &result, proc->procW ); @@ -2309,7 +2340,7 @@ INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; - if (!(proc = handle_to_proc( (WNDPROC)func ))) + if (!(proc = handle_to_proc( func )) && !(proc = find_builtin_proc( func ))) ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc->procA) ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, proc->procA ); @@ -2338,7 +2369,7 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; - if (!(proc = handle_to_proc( (WNDPROC)func ))) + if (!(proc = handle_to_proc( func )) && !(proc = find_builtin_proc( func ))) ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc->procW) ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, proc->procW );

1 0

Maarten Lankhorst : winealsa: Fix GetPosition in dsoutput.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 8e485a15c15b3a3474f82ef466cd936fdd466c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e485a15c15b3a3474f82ef46… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Aug 2 14:16:31 2007 +0200 winealsa: Fix GetPosition in dsoutput. --- dlls/winealsa.drv/dsoutput.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index ce1ae02..f6a2d96 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -530,7 +530,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, LPDWORD lpdwPlay, LPDWORD lpdwWrite) { IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; - snd_pcm_uframes_t hw_pptr=0, hw_wptr=0; + snd_pcm_uframes_t hw_pptr, hw_wptr; snd_pcm_state_t state; /* **** */ @@ -562,10 +562,11 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, else hw_pptr = This->mmap_buflen_frames + This->mmap_pos - used; hw_pptr %= This->mmap_buflen_frames; - hw_wptr = This->mmap_pos; TRACE("At position: %ld (%ld) - Used %ld\n", hw_pptr, This->mmap_pos, used); } + else hw_pptr = This->mmap_pos; + hw_wptr = This->mmap_pos; LeaveCriticalSection(&This->pcm_crst); /* **** */

1 0

Alexandre Julliard : ntdll: Relax the activation context size check.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: ed3b5322f634a1c75375873ebe7b9191505a8694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3b5322f634a1c75375873eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 2 13:07:23 2007 +0200 ntdll: Relax the activation context size check. --- dlls/ntdll/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index eb4cb71..f7a0fb9 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2157,7 +2157,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) TRACE("%p %08x\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); - if (!pActCtx || pActCtx->cbSize != sizeof(*pActCtx) || + if (!pActCtx || pActCtx->cbSize < sizeof(*pActCtx) || (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL)) return STATUS_INVALID_PARAMETER;

1 0

Mikołaj Zalewski : write.exe: Add a new program that calls wordpad.exe.
by Alexandre Julliard Aug. 2, 2007

Aug. 2, 2007

Module: wine Branch: master Commit: 2777a94d4eef7dd8f8d422bed1c1363a059f9109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2777a94d4eef7dd8f8d422bed… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 1 20:01:29 2007 -0700 write.exe: Add a new program that calls wordpad.exe. --- .gitignore | 2 + Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + programs/Makefile.in | 2 + programs/write/En.rc | 26 +++++++++++++++++++++ programs/write/Makefile.in | 15 ++++++++++++ programs/write/resources.h | 19 +++++++++++++++ programs/write/rsrc.rc | 24 +++++++++++++++++++ programs/write/write.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 148 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 2c87b7a..0ddaa04 100644 --- a/.gitignore +++ b/.gitignore @@ -936,6 +936,8 @@ programs/wordpad/rsrc.res programs/wordpad/toolbar.bmp programs/wordpad/wordpad programs/wordpad/wordpad.ico +programs/write/rsrc.res +programs/write/write programs/xcopy/rsrc.res programs/xcopy/xcopy server/wineserver diff --git a/Makefile.in b/Makefile.in index 8174a91..002f425 100644 --- a/Makefile.in +++ b/Makefile.in @@ -493,6 +493,7 @@ ALL_MAKEFILES = \ programs/winhelp/Makefile \ programs/winver/Makefile \ programs/wordpad/Makefile \ + programs/write/Makefile \ programs/xcopy/Makefile \ server/Makefile \ tools/Makefile \ @@ -856,6 +857,7 @@ programs/winevdm/Makefile: programs/winevdm/Makefile.in programs/Makeprog.rules programs/winhelp/Makefile: programs/winhelp/Makefile.in programs/Makeprog.rules programs/winver/Makefile: programs/winver/Makefile.in programs/Makeprog.rules programs/wordpad/Makefile: programs/wordpad/Makefile.in programs/Makeprog.rules +programs/write/Makefile: programs/write/Makefile.in programs/Makeprog.rules programs/xcopy/Makefile: programs/xcopy/Makefile.in programs/Makeprog.rules server/Makefile: server/Makefile.in Make.rules tools/Makefile: tools/Makefile.in Make.rules diff --git a/configure b/configure index 35ec7ff..fdcdbd5 100755 --- a/configure +++ b/configure @@ -20936,6 +20936,8 @@ ac_config_files="$ac_config_files programs/winver/Makefile" ac_config_files="$ac_config_files programs/wordpad/Makefile" +ac_config_files="$ac_config_files programs/write/Makefile" + ac_config_files="$ac_config_files programs/xcopy/Makefile" ac_config_files="$ac_config_files server/Makefile" @@ -21863,6 +21865,7 @@ do "programs/winhelp/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winhelp/Makefile" ;; "programs/winver/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winver/Makefile" ;; "programs/wordpad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/wordpad/Makefile" ;; + "programs/write/Makefile") CONFIG_FILES="$CONFIG_FILES programs/write/Makefile" ;; "programs/xcopy/Makefile") CONFIG_FILES="$CONFIG_FILES programs/xcopy/Makefile" ;; "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; diff --git a/configure.ac b/configure.ac index 780b419..e6088ec 100644 --- a/configure.ac +++ b/configure.ac @@ -1894,6 +1894,7 @@ AC_CONFIG_FILES([programs/winevdm/Makefile]) AC_CONFIG_FILES([programs/winhelp/Makefile]) AC_CONFIG_FILES([programs/winver/Makefile]) AC_CONFIG_FILES([programs/wordpad/Makefile]) +AC_CONFIG_FILES([programs/write/Makefile]) AC_CONFIG_FILES([programs/xcopy/Makefile]) AC_CONFIG_FILES([server/Makefile]) AC_CONFIG_FILES([tools/Makefile]) diff --git a/programs/Makefile.in b/programs/Makefile.in index 9ea131b..1a3d3d5 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -45,6 +45,7 @@ SUBDIRS = \ winhelp \ winver \ wordpad \ + write \ xcopy # Sub-directories to run make install into @@ -85,6 +86,7 @@ INSTALLSUBDIRS = \ winhelp \ winver \ wordpad \ + write \ xcopy # Programs to install in bin directory diff --git a/programs/write/En.rc b/programs/write/En.rc new file mode 100644 index 0000000..5215db5 --- /dev/null +++ b/programs/write/En.rc @@ -0,0 +1,26 @@ +/* + * English language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Starting Wordpad failed" +} diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in new file mode 100644 index 0000000..1e877ef --- /dev/null +++ b/programs/write/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = write.exe +APPMODE = -mwindows +IMPORTS = user32 gdi32 kernel32 + +C_SRCS = write.c + +RC_SRCS = rsrc.rc + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/write/resources.h b/programs/write/resources.h new file mode 100644 index 0000000..e99e5b1 --- /dev/null +++ b/programs/write/resources.h @@ -0,0 +1,19 @@ +/* + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define IDS_FAILED 101 diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc new file mode 100644 index 0000000..06e4040 --- /dev/null +++ b/programs/write/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include "resources.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "En.rc" diff --git a/programs/write/write.c b/programs/write/write.c new file mode 100644 index 0000000..0f2aca0 --- /dev/null +++ b/programs/write/write.c @@ -0,0 +1,54 @@ +/* + * Write.exe - this program only calls wordpad.exe + * + * Copyright 2007 by Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN + +#include <stdarg.h> + +#include <windows.h> +#include "resources.h" + +static const WCHAR SZ_BACKSLASH[] = {'\\',0}; +static const WCHAR SZ_WORDPAD[] = {'w','o','r','d','p','a','d','.','e','x','e',0}; + +int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) +{ + WCHAR path[MAX_PATH]; + STARTUPINFOW stinf; + PROCESS_INFORMATION info; + + if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) + goto failed; + if (path[lstrlenW(path) - 1] != '\\') + lstrcatW(path, SZ_BACKSLASH); + lstrcatW(path, SZ_WORDPAD); + + stinf.cb = sizeof(STARTUPINFO); + GetStartupInfoW(&stinf); + + if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) + goto failed; + return 0; + +failed: + LoadStringW(GetModuleHandle(NULL), IDS_FAILED, path, MAX_PATH); + MessageBoxW(NULL, path, NULL, MB_OK|MB_ICONERROR); + return 1; +}

1 0