wine-commits August 2008

wine-commits@winehq.org

2 participants
839 discussions

James Hawkins : msi: Factor out media handling and use the new interface to efficiently extract assemblies .
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 74239fcd915cddcff5bf52d62a7082db9b4586c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74239fcd915cddcff5bf52d62… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 22:59:44 2008 -0500 msi: Factor out media handling and use the new interface to efficiently extract assemblies. --- dlls/msi/Makefile.in | 1 + dlls/msi/action.c | 267 ++++++++++++++++------ dlls/msi/files.c | 629 +++---------------------------------------------- dlls/msi/helpers.c | 133 ----------- dlls/msi/media.c | 632 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 21 ++- 6 files changed, 891 insertions(+), 792 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74239fcd915cddcff5bf5…

1 0

James Hawkins : msi: Perform costing again for the InstallExecute sequence.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: bf51518449f999a2dac2fd8b1060ea5590b574f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf51518449f999a2dac2fd8b1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 22:58:17 2008 -0500 msi: Perform costing again for the InstallExecute sequence. --- dlls/msi/action.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2c4ff14..142eaff 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2178,9 +2178,6 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) MSIQUERY * view; LPWSTR level; - if ( 1 == msi_get_property_int( package, szCosting, 0 ) ) - return ERROR_SUCCESS; - TRACE("Building Directory properties\n"); rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); @@ -2215,6 +2212,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) TRACE("Disabling component %s\n", debugstr_w(comp->Component)); comp->Enabled = FALSE; } + else + comp->Enabled = TRUE; } MSI_SetPropertyW(package,szCosting,szOne);

1 0

James Hawkins : msi: Ignore all non-stream elements when filling the _Streams table.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: d9f2120f14727445d6e91719d63e81e3d0e719ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f2120f14727445d6e91719d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 22:57:24 2008 -0500 msi: Ignore all non-stream elements when filling the _Streams table. --- dlls/msi/streams.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 318fb41..e3846ad 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -464,6 +464,9 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) if (FAILED(hr) || !size) break; + if (stat.type != STGTY_STREAM) + continue; + /* table streams are not in the _Streams table */ if (*stat.pwcsName == 0x4840) {

1 0

Maarten Lankhorst : winmm: Test opening the same device twice.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 6a7127bfc201ff7a218795c239d5b2571ea413d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7127bfc201ff7a218795c23… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Aug 18 23:56:56 2008 +0200 winmm: Test opening the same device twice. Behavioral test to show that wine winmm needs fixing. --- dlls/winmm/tests/wave.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 6401fd3..a66afa3 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -37,6 +37,38 @@ #include "winmm_test.h" +static void test_multiple_waveopens(void) +{ + HWAVEOUT handle1, handle2; + MMRESULT ret; + WAVEFORMATEX wfx; + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 1; + wfx.nSamplesPerSec = 11025; + wfx.nBlockAlign = 1; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + wfx.wBitsPerSample = 8; + wfx.cbSize = 0; + + ret = waveOutOpen(&handle1, 0, &wfx, 0, 0, 0); + if (ret != MMSYSERR_NOERROR) + { + skip("Could not do the duplicate waveopen test\n"); + return; + } + + ret = waveOutOpen(&handle2, 0, &wfx, 0, 0, 0); + /* In windows this is most likely allowed, in wine an application can use the waveout + * interface, but so can directsound.. this causes problems if directsound goes active + */ + todo_wine ok(ret == MMSYSERR_NOERROR, "waveOutOpen returns: %x\n", ret); + if (ret == MMSYSERR_NOERROR) + waveOutClose(handle2); + + waveOutClose(handle1); +} + /* * Note that in most of this test we may get MMSYSERR_BADDEVICEID errors * at about any time if the user starts another application that uses the @@ -1428,5 +1460,6 @@ static void wave_out_tests(void) START_TEST(wave) { + test_multiple_waveopens(); wave_out_tests(); }

1 0

Maarten Lankhorst : dsound: Remove int24_struct from conversion routines.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 179990ac36024b8f6054b68aa9849cc8a4cfd57e URL: http://source.winehq.org/git/wine.git/?a=commit;h=179990ac36024b8f6054b68aa… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Aug 18 23:46:34 2008 +0200 dsound: Remove int24_struct from conversion routines. --- dlls/dsound/dsound_convert.c | 75 ++++++++++++++++++++--------------------- 1 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 649bd78..4b5ff4b 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -52,10 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); -typedef struct { - uint8_t byte[3]; -} int24_struct; - #ifdef WORDS_BIGENDIAN #define le16(x) RtlUshortByteSwap((x)) #define le32(x) RtlUlongByteSwap((x)) @@ -79,10 +75,10 @@ static void convert_8_to_16 (const void *src, void *dst) static void convert_8_to_24 (const void *src, void *dst) { uint8_t dest = *(uint8_t*)src; - int24_struct *dest24 = dst; - dest24->byte[0] = dest; - dest24->byte[1] = dest; - dest24->byte[2] = dest - 0x80; + uint8_t *dest24 = dst; + dest24[0] = dest; + dest24[1] = dest; + dest24[2] = dest - 0x80; } static void convert_8_to_32 (const void *src, void *dst) @@ -107,11 +103,11 @@ static void convert_16_to_16 (const void *src, void *dst) static void convert_16_to_24 (const void *src, void *dst) { uint16_t dest = le16(*(uint16_t*)src); - int24_struct *dest24 = dst; + uint8_t *dest24 = dst; - dest24->byte[0] = dest / 256; - dest24->byte[1] = dest; - dest24->byte[2] = dest / 256; + dest24[0] = dest / 256; + dest24[1] = dest; + dest24[2] = dest / 256; } static void convert_16_to_32 (const void *src, void *dst) @@ -123,34 +119,37 @@ static void convert_16_to_32 (const void *src, void *dst) static void convert_24_to_8 (const void *src, void *dst) { uint8_t *dst8 = dst; - *dst8 = ((int24_struct*)src)->byte[2]; + *dst8 = ((uint8_t *)src)[2]; } static void convert_24_to_16 (const void *src, void *dst) { uint16_t *dest16 = dst; - const int24_struct *source = src; - *dest16 = le16(source->byte[2] * 256 + source->byte[1]); + const uint8_t *source = src; + *dest16 = le16(source[2] * 256 + source[1]); } static void convert_24_to_24 (const void *src, void *dst) { - int24_struct *dest24 = dst; - const int24_struct *src24 = src; - *dest24 = *src24; + uint8_t *dest24 = dst; + const uint8_t *src24 = src; + + dest24[0] = src24[0]; + dest24[1] = src24[1]; + dest24[2] = src24[2]; } static void convert_24_to_32 (const void *src, void *dst) { uint32_t *dest32 = dst; - const int24_struct *source = src; - *dest32 = le32(source->byte[2] * 16777217 + source->byte[1] * 65536 + source->byte[0] * 256); + const uint8_t *source = src; + *dest32 = le32(source[2] * 16777217 + source[1] * 65536 + source[0] * 256); } static void convert_32_to_8 (const void *src, void *dst) { uint8_t *dst8 = dst; - *dst8 = (le32(*(uint32_t*)src) / 16777216); + *dst8 = (le32(*(uint32_t *)src) / 16777216); *dst8 -= 0x80; } @@ -163,11 +162,11 @@ static void convert_32_to_16 (const void *src, void *dst) static void convert_32_to_24 (const void *src, void *dst) { uint32_t dest = le32(*(uint32_t*)dst); - int24_struct *dest24 = dst; + uint8_t *dest24 = dst; - dest24->byte[0] = dest / 256; - dest24->byte[1] = dest / 65536; - dest24->byte[2] = dest / 16777216; + dest24[0] = dest / 256; + dest24[1] = dest / 65536; + dest24[2] = dest / 16777216; } static void convert_32_to_32 (const void *src, void *dst) @@ -202,15 +201,15 @@ static void mix16(int16_t *src, int32_t *dst, unsigned len) } } -static void mix24(int24_struct *src, int32_t *dst, unsigned len) +static void mix24(uint8_t *src, int32_t *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); len /= 3; while (len--) { uint32_t field; - field = ((unsigned)src->byte[2] << 16) + ((unsigned)src->byte[1] << 8) + (unsigned)src->byte[0]; - if (src->byte[2] & 0x80) + field = ((unsigned)src[2] << 16) + ((unsigned)src[1] << 8) + (unsigned)src[0]; + if (src[2] & 0x80) field |= 0xFF000000U; *(dst++) += field; ++src; @@ -263,7 +262,7 @@ static void norm16(int32_t *src, int16_t *dst, unsigned len) } } -static void norm24(int32_t *src, int24_struct *dst, unsigned len) +static void norm24(int32_t *src, uint8_t *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); len /= 3; @@ -271,21 +270,21 @@ static void norm24(int32_t *src, int24_struct *dst, unsigned len) { if (*src <= -0x800000) { - dst->byte[0] = 0; - dst->byte[1] = 0; - dst->byte[2] = 0x80; + dst[0] = 0; + dst[1] = 0; + dst[2] = 0x80; } else if (*src > 0x7fffff) { - dst->byte[0] = 0xff; - dst->byte[1] = 0xff; - dst->byte[2] = 0x7f; + dst[0] = 0xff; + dst[1] = 0xff; + dst[2] = 0x7f; } else { - dst->byte[0] = *src; - dst->byte[1] = *src >> 8; - dst->byte[2] = *src >> 16; + dst[0] = *src; + dst[1] = *src >> 8; + dst[2] = *src >> 16; } ++dst; ++src;

1 0

Maarten Lankhorst : winealsa.drv: Fix compiler warnings and remove deprecated calls.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 3995627de204284de96d50d3a42291f02e42c344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3995627de204284de96d50d3a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Aug 18 20:37:14 2008 +0200 winealsa.drv: Fix compiler warnings and remove deprecated calls. Fixes wine build on lsb compliant systems and some warnings. --- dlls/winealsa.drv/alsa.c | 10 ++++++---- dlls/winealsa.drv/dscapture.c | 3 +-- dlls/winealsa.drv/dsoutput.c | 5 ++--- dlls/winealsa.drv/wavein.c | 1 - dlls/winealsa.drv/waveout.c | 7 +++++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index a4b1008..0623244 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -621,8 +621,6 @@ void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * int err; snd_pcm_format_t format; snd_pcm_access_t access; - err = snd_pcm_hw_params_get_access(hw_params, &access); - err = snd_pcm_hw_params_get_format(hw_params, &format); #define X(x) ((x)? "true" : "false") if (full) @@ -640,8 +638,11 @@ void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * X(snd_pcm_hw_params_is_joint_duplex(hw_params))); #undef X - if (access >= 0) + err = snd_pcm_hw_params_get_access(hw_params, &access); + if (err >= 0) + { TRACE("access=%s\n", snd_pcm_access_name(access)); + } else { snd_pcm_access_mask_t * acmask; @@ -654,7 +655,8 @@ void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * HeapFree( GetProcessHeap(), 0, acmask ); } - if (format >= 0) + err = snd_pcm_hw_params_get_format(hw_params, &format); + if (err >= 0) { TRACE("format=%s\n", snd_pcm_format_name(format)); diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 98fe195..6c5b4a4 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -448,11 +448,10 @@ static int CreateMMAP(IDsCaptureDriverBufferImpl* pdbi) snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, INT_MAX); snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0); snd_pcm_sw_params_set_avail_min(pcm, sw_params, 0); - snd_pcm_sw_params_set_xrun_mode(pcm, sw_params, SND_PCM_XRUN_NONE); err = snd_pcm_sw_params(pcm, sw_params); avail = snd_pcm_avail_update(pcm); - if (avail < 0) + if ((snd_pcm_sframes_t)avail < 0) { ERR("No buffer is available: %s.\n", snd_strerror(avail)); return DSERR_GENERIC; diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 72fc0a7..4043ccf 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -207,14 +207,13 @@ static int DSDB_CreateMMAP(IDsDriverBufferImpl* pdbi) snd_pcm_sw_params_set_start_threshold(pcm, sw_params, 0); snd_pcm_sw_params_get_boundary(sw_params, &boundary); snd_pcm_sw_params_set_stop_threshold(pcm, sw_params, boundary); - snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, INT_MAX); + snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, boundary); snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0); snd_pcm_sw_params_set_avail_min(pcm, sw_params, 0); - snd_pcm_sw_params_set_xrun_mode(pcm, sw_params, SND_PCM_XRUN_NONE); err = snd_pcm_sw_params(pcm, sw_params); avail = snd_pcm_avail_update(pcm); - if (avail < 0) + if ((snd_pcm_sframes_t)avail < 0) { ERR("No buffer is available: %s.\n", snd_strerror(avail)); return DSERR_GENERIC; diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 9c89fde..af62bcf 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -483,7 +483,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set start threshold"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence size"); EXIT_ON_ERROR( snd_pcm_sw_params_set_avail_min(pcm, sw_params, period_size), MMSYSERR_ERROR, "unable to set avail min"); - EXIT_ON_ERROR( snd_pcm_sw_params_set_xfer_align(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set xfer align"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence threshold"); EXIT_ON_ERROR( snd_pcm_sw_params(pcm, sw_params), MMSYSERR_ERROR, "unable to set sw params for playback"); #undef EXIT_ON_ERROR diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index f4452e5..62e7f4f 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -537,6 +537,7 @@ static DWORD CALLBACK wodPlayer(LPVOID pmt) dwNextFeedTime = dwNextNotifyTime = INFINITE; } } + return 0; } /************************************************************************** @@ -574,6 +575,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) unsigned int period_time = 10000; snd_pcm_uframes_t buffer_size; snd_pcm_uframes_t period_size; + snd_pcm_uframes_t boundary; int flags; int err=0; int dir=0; @@ -756,12 +758,13 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) err = snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size); snd_pcm_sw_params_current(pcm, sw_params); + snd_pcm_sw_params_get_boundary(sw_params, &boundary); + EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set start threshold"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence size"); EXIT_ON_ERROR( snd_pcm_sw_params_set_avail_min(pcm, sw_params, period_size), MMSYSERR_ERROR, "unable to set avail min"); - EXIT_ON_ERROR( snd_pcm_sw_params_set_xfer_align(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set xfer align"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence threshold"); - EXIT_ON_ERROR( snd_pcm_sw_params_set_xrun_mode(pcm, sw_params, SND_PCM_XRUN_NONE), MMSYSERR_ERROR, "unable to set xrun mode"); + EXIT_ON_ERROR( snd_pcm_sw_params_set_stop_threshold(pcm, sw_params, boundary), MMSYSERR_ERROR, "unable to set xrun mode"); EXIT_ON_ERROR( snd_pcm_sw_params(pcm, sw_params), MMSYSERR_ERROR, "unable to set sw params for playback"); #undef EXIT_ON_ERROR

1 0

James Hawkins : fusion: Ignore the case of the assembly filename extension.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 236147b5682cd973ec5a689833b4cc20f966e492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=236147b5682cd973ec5a68983… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 22:56:22 2008 -0500 fusion: Ignore the case of the assembly filename extension. --- dlls/fusion/asmcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 7da79f4..57c7aed 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -213,7 +213,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (!(ext = strrchrW(pszManifestFilePath, '.'))) return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - if (lstrcmpW(ext, ext_exe) && lstrcmpW(ext, ext_dll)) + if (lstrcmpiW(ext, ext_exe) && lstrcmpiW(ext, ext_dll)) return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); if (GetFileAttributesW(pszManifestFilePath) == INVALID_FILE_ATTRIBUTES)

1 0

James Hawkins : fusion: Align the metadata header pointer on a DWORD boundary.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: cfc68a96c785f29dc392ae9701c433aa44e1025e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfc68a96c785f29dc392ae970… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 22:55:29 2008 -0500 fusion: Align the metadata header pointer on a DWORD boundary. --- dlls/fusion/assembly.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index fc44e49..75ca048 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -632,8 +632,8 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly) else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) assembly->blobs = (BYTE *)assembly_data_offset(assembly, ofs); - ptr += lstrlenA(stream); - while (!*ptr) ptr++; + ptr += lstrlenA(stream) + 1; + ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ } return S_OK;

1 0

James Hawkins : fusion: Handle loading 64-bit .NET assemblies.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: dd9b0edb6f1cc22097ab7bca42aa0620c943d4bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9b0edb6f1cc22097ab7bca4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 22:54:43 2008 -0500 fusion: Handle loading 64-bit .NET assemblies. --- dlls/fusion/assembly.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index ec86fd3..fc44e49 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -58,7 +58,7 @@ struct tagASSEMBLY HANDLE hmap; BYTE *data; - IMAGE_NT_HEADERS32 *nthdr; + IMAGE_NT_HEADERS *nthdr; IMAGE_COR20_HEADER *corhdr; METADATAHDR *metadatahdr; @@ -647,7 +647,15 @@ static HRESULT parse_pe_header(ASSEMBLY *assembly) if (!assembly->nthdr) return E_FAIL; - datadirs = assembly->nthdr->OptionalHeader.DataDirectory; + if (assembly->nthdr->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) + { + IMAGE_OPTIONAL_HEADER64 *opthdr = + (IMAGE_OPTIONAL_HEADER64 *)&assembly->nthdr->OptionalHeader; + datadirs = opthdr->DataDirectory; + } + else + datadirs = assembly->nthdr->OptionalHeader.DataDirectory; + if (!datadirs) return E_FAIL;

1 0

James Hawkins : ole32: Test the file access and share modes of StgCreateDocFile.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 48524c9b92bf56d12627d03062e164f0c8138ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=48524c9b92bf56d12627d0306… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 22:50:52 2008 -0500 ole32: Test the file access and share modes of StgCreateDocFile. --- dlls/ole32/tests/storage32.c | 180 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 180 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 7dc633c..d0b60e8 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -999,6 +999,185 @@ static void test_ReadClassStm(void) ok(IsEqualCLSID(&clsid, &test_stg_cls), "clsid should have been set to CLSID_WineTest\n"); } +struct access_res +{ + BOOL gothandle; + DWORD lasterr; + BOOL todo; +}; + +struct access_res create[16] = +{ + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } +}; + +struct access_res create_commit[16] = +{ + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } +}; + +struct access_res create_close[16] = +{ + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE } +}; + +static void _test_file_access(LPCSTR file, struct access_res *ares, DWORD line) +{ + DWORD access = 0, share = 0; + DWORD lasterr; + HANDLE hfile; + int i, j, idx = 0; + + for (i = 0; i < 4; i++) + { + if (i == 0) access = 0; + if (i == 1) access = GENERIC_READ; + if (i == 2) access = GENERIC_WRITE; + if (i == 3) access = GENERIC_READ | GENERIC_WRITE; + + for (j = 0; j < 4; j++) + { + if (j == 0) share = 0; + if (j == 1) share = FILE_SHARE_READ; + if (j == 2) share = FILE_SHARE_WRITE; + if (j == 3) share = FILE_SHARE_READ | FILE_SHARE_WRITE; + + SetLastError(0xdeadbeef); + hfile = CreateFileA(file, access, share, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, 0); + lasterr = GetLastError(); + if (ares[idx].todo) + { + todo_wine + { + ok((hfile != INVALID_HANDLE_VALUE) == ares[idx].gothandle, + "(%d, handle, %d): Expected %d, got %d\n", + line, idx, ares[idx].gothandle, + (hfile != INVALID_HANDLE_VALUE)); + } + } + else + ok((hfile != INVALID_HANDLE_VALUE) == ares[idx].gothandle, + "(%d, handle, %d): Expected %d, got %d\n", + line, idx, ares[idx].gothandle, + (hfile != INVALID_HANDLE_VALUE)); + + if (ares[idx].todo) + { + todo_wine + { + ok(lasterr == ares[idx].lasterr, + "(%d, lasterr, %d): Expected %d, got %d\n", + line, idx, ares[idx].lasterr, lasterr); + } + } + else + { + ok(lasterr == ares[idx].lasterr, + "(%d, lasterr, %d): Expected %d, got %d\n", + line, idx, ares[idx].lasterr, lasterr); + } + + CloseHandle(hfile); + idx++; + } + } +} + +#define test_file_access(file, ares) _test_file_access(file, ares, __LINE__) + +static void test_access(void) +{ + IStorage *stg; + HRESULT hr; + + static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + + /* STGM_TRANSACTED */ + + hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | + STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, &stg); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_file_access("winetest", create); + + hr = IStorage_Commit(stg, STGC_DEFAULT); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_file_access("winetest", create_commit); + + IStorage_Release(stg); + + test_file_access("winetest", create_close); + + DeleteFileA("winetest"); + + /* STGM_DIRECT */ + + hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | + STGM_SHARE_EXCLUSIVE | STGM_DIRECT, 0, &stg); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_file_access("winetest", create); + + hr = IStorage_Commit(stg, STGC_DEFAULT); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_file_access("winetest", create_commit); + + IStorage_Release(stg); + + test_file_access("winetest", create_close); + + DeleteFileA("winetest"); + +} + START_TEST(storage32) { test_hglobal_storage_stat(); @@ -1010,4 +1189,5 @@ START_TEST(storage32) test_streamenum(); test_transact(); test_ReadClassStm(); + test_access(); }

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2008