September 2011 - Wine-commits

Stefan Dösinger : d3d9: Implement FPUSETUP for msvc.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: e1d92059ea193ad8852de737748cd69ce10a5712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d92059ea193ad8852de7377… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 24 12:42:14 2011 +0200 d3d9: Implement FPUSETUP for msvc. --- dlls/d3d9/device.c | 5 +++++ dlls/d3d9/tests/device.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5433738..2c67391 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3306,6 +3306,11 @@ static void setup_fpu(void) __asm__ volatile ("fnstcw %0" : "=m" (cw)); cw = (cw & ~0xf3f) | 0x3f; __asm__ volatile ("fldcw %0" : : "m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) + WORD cw; + __asm fnstcw cw; + cw = (cw & ~0xf3f) | 0x3f; + __asm fldcw cw; #else FIXME("FPU setup not implemented for this platform.\n"); #endif diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 625dce9..482f5d4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2913,8 +2913,13 @@ cleanup: static inline void set_fpu_cw(WORD cw) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#define D3D9_TEST_SET_FPU_CW 1 __asm__ volatile ("fnclex"); __asm__ volatile ("fldcw %0" : : "m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) +#define D3D9_TEST_SET_FPU_CW 1 + __asm fnclex; + __asm fldcw cw; #endif } @@ -2922,14 +2927,18 @@ static inline WORD get_fpu_cw(void) { WORD cw = 0; #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#define D3D9_TEST_GET_FPU_CW 1 __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) +#define D3D9_TEST_GET_FPU_CW 1 + __asm fnstcw cw; #endif return cw; } static void test_fpu_setup(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) D3DPRESENT_PARAMETERS present_parameters; IDirect3DDevice9 *device; HWND window = NULL;

1 0

Stefan Dösinger : d3d8: Implement FPUSETUP for msvc.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 14a245690d333ed6ee7837b4d547790d50821c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a245690d333ed6ee7837b4d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 24 12:45:37 2011 +0200 d3d8: Implement FPUSETUP for msvc. --- dlls/d3d8/device.c | 5 +++++ dlls/d3d8/tests/device.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 51c4ad7..8aeca94 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3032,6 +3032,11 @@ static void setup_fpu(void) __asm__ volatile ("fnstcw %0" : "=m" (cw)); cw = (cw & ~0xf3f) | 0x3f; __asm__ volatile ("fldcw %0" : : "m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) + WORD cw; + __asm fnstcw cw; + cw = (cw & ~0xf3f) | 0x3f; + __asm fldcw cw; #else FIXME("FPU setup not implemented for this platform.\n"); #endif diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 42726aa..42d4dd0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2416,8 +2416,13 @@ done: static inline void set_fpu_cw(WORD cw) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#define D3D8_TEST_SET_FPU_CW 1 __asm__ volatile ("fnclex"); __asm__ volatile ("fldcw %0" : : "m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) +#define D3D8_TEST_SET_FPU_CW 1 + __asm fnclex; + __asm fldcw cw; #endif } @@ -2425,14 +2430,18 @@ static inline WORD get_fpu_cw(void) { WORD cw = 0; #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#define D3D8_TEST_GET_FPU_CW 1 __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) +#define D3D8_TEST_GET_FPU_CW 1 + __asm fnstcw cw; #endif return cw; } static void test_fpu_setup(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) D3DPRESENT_PARAMETERS present_parameters; IDirect3DDevice8 *device; D3DDISPLAYMODE d3ddm;

1 0

Michael Mc Donnell : d3dx9_36/tests: Fixed adjacency double free (valgrind) .
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 3ad597640772dd464a69e82e54d88c838bee79e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad597640772dd464a69e82e5… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Sat Sep 24 13:16:23 2011 +0200 d3dx9_36/tests: Fixed adjacency double free (valgrind). --- dlls/d3dx9_36/tests/mesh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 686e386..6a78e64 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -5949,6 +5949,7 @@ static void test_convert_point_reps_to_adjacency(void) } HeapFree(GetProcessHeap(), 0, adjacency); + adjacency = NULL; if (i != 0) /* First mesh will be freed during cleanup */ mesh->lpVtbl->Release(mesh); }

1 0

Marcus Meissner : wpp: Add semicolons at end of code rules.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 59e817c52348a5948e7a3d324f08757a088e6521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e817c52348a5948e7a3d324… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 25 11:22:37 2011 +0200 wpp: Add semicolons at end of code rules. --- libs/wpp/ppy.y | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index f2805e1..dbbe972 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -383,24 +383,24 @@ pp_expr : tSINT { $$.type = cv_sint; $$.val.si = $1; } | tIDENT { $$.type = cv_sint; $$.val.si = 0; } | pp_expr tLOGOR pp_expr { $$.type = cv_sint; $$.val.si = boolean(&$1) || boolean(&$3); } | pp_expr tLOGAND pp_expr { $$.type = cv_sint; $$.val.si = boolean(&$1) && boolean(&$3); } - | pp_expr tEQ pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, ==) } - | pp_expr tNE pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, !=) } - | pp_expr '<' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, <) } - | pp_expr '>' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, >) } - | pp_expr tLTE pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, <=) } - | pp_expr tGTE pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, >=) } - | pp_expr '+' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, +) } - | pp_expr '-' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, -) } - | pp_expr '^' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, ^) } - | pp_expr '&' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, &) } - | pp_expr '|' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, |) } - | pp_expr '*' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, *) } - | pp_expr '/' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, /) } - | pp_expr tLSHIFT pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, <<) } - | pp_expr tRSHIFT pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, >>) } + | pp_expr tEQ pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, ==); } + | pp_expr tNE pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, !=); } + | pp_expr '<' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, <); } + | pp_expr '>' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, >); } + | pp_expr tLTE pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, <=); } + | pp_expr tGTE pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, >=); } + | pp_expr '+' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, +); } + | pp_expr '-' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, -); } + | pp_expr '^' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, ^); } + | pp_expr '&' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, &); } + | pp_expr '|' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, |); } + | pp_expr '*' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, *); } + | pp_expr '/' pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, /); } + | pp_expr tLSHIFT pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, <<); } + | pp_expr tRSHIFT pp_expr { promote_equal_size(&$1, &$3); BIN_OP($$, $1, $3, >>); } | '+' pp_expr { $$ = $2; } - | '-' pp_expr { UNARY_OP($$, $2, -) } - | '~' pp_expr { UNARY_OP($$, $2, ~) } + | '-' pp_expr { UNARY_OP($$, $2, -); } + | '~' pp_expr { UNARY_OP($$, $2, ~); } | '!' pp_expr { $$.type = cv_sint; $$.val.si = !boolean(&$2); } | '(' pp_expr ')' { $$ = $2; } | pp_expr '?' pp_expr ':' pp_expr { $$ = boolean(&$1) ? $3 : $5; }

1 0

Jörg Höhle : winealsa: Simplify the test for 8bit linear PCM.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 386f7639f3915ceaf341cad5fe2cce6d9d8b8718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=386f7639f3915ceaf341cad5f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 16 10:12:48 2011 +0200 winealsa: Simplify the test for 8bit linear PCM. --- dlls/winealsa.drv/mmdevdrv.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8118103..aa68865 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2076,11 +2076,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( buffer = This->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT){ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; - if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->fmt->wBitsPerSample == 8) + if(This->fmt->wBitsPerSample == 8) memset(buffer, 128, written_frames * This->fmt->nBlockAlign); else memset(buffer, 0, written_frames * This->fmt->nBlockAlign);

1 0

Jörg Höhle : wineoss: Simplify the test for 8bit linear PCM.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: fabbebf94b099ed221fa67b647e86c3d05a1b2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabbebf94b099ed221fa67b64… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 8 14:21:21 2011 +0200 wineoss: Simplify the test for 8bit linear PCM. --- dlls/wineoss.drv/mmdevdrv.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b7e3bbf..d2d5e75 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1196,11 +1196,7 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, static void oss_silence_buffer(ACImpl *This, BYTE *buf, UINT32 frames) { - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; - if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->fmt->wBitsPerSample == 8) + if(This->fmt->wBitsPerSample == 8) memset(buf, 128, frames * This->fmt->nBlockAlign); else memset(buf, 0, frames * This->fmt->nBlockAlign);

1 0

Jörg Höhle : winmm: Fix sum of available samples.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 38752f5bf7ab7d39846bcb5997a934aad01b3f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38752f5bf7ab7d39846bcb599… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Sep 23 10:24:13 2011 +0200 winmm: Fix sum of available samples. --- dlls/winmm/waveform.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1152f61..8567352 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1329,8 +1329,7 @@ static void WOD_PushData(WINMM_Device *device) nloops = 0; while(queue && queue_frames < avail_frames){ queue_bytes = WINMM_HeaderLenBytes(device, queue); - queue_frames = (queue_bytes - ofs) / device->bytes_per_frame; - + queue_frames += (queue_bytes - ofs) / device->bytes_per_frame; ofs = 0; if(queue->dwFlags & WHDR_ENDLOOP && nloops < device->loop_counter){

1 0

Jörg Höhle : winmm: Separate WINMM_Pause and WINMM_Reset.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: afa5751015b71371954ee7b6593ab16710a34126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa5751015b71371954ee7b65… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 22 20:36:31 2011 +0200 winmm: Separate WINMM_Pause and WINMM_Reset. --- dlls/winmm/waveform.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 8567352..1593047 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1671,17 +1671,18 @@ static LRESULT WINMM_Reset(HWAVE hwave) WINMM_CBInfo cb_info; WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); WAVEHDR *first; - MMRESULT mr; + HRESULT hr; TRACE("(%p)\n", hwave); if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - mr = WINMM_Pause(hwave); - if(mr != MMSYSERR_NOERROR){ + hr = IAudioClient_Stop(device->client); + if(FAILED(hr)){ LeaveCriticalSection(&device->lock); - return mr; + ERR("Stop failed: %08x\n", hr); + return MMSYSERR_ERROR; } device->stopped = TRUE; @@ -1694,6 +1695,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) device->played_frames = 0; device->loop_counter = 0; device->last_clock_pos = 0; + IAudioClient_Reset(device->client); cb_info = device->cb_info;

1 0

Jörg Höhle : winmm: waveOutReset returns all buffers.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 5f9e03d1187f48a1cb25336cb04c513dd237f849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9e03d1187f48a1cb25336cb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 22 20:47:14 2011 +0200 winmm: waveOutReset returns all buffers. --- dlls/winmm/waveform.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1593047..3ab7976 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1670,6 +1670,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) { WINMM_CBInfo cb_info; WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); + BOOL is_out; WAVEHDR *first; HRESULT hr; @@ -1686,10 +1687,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) } device->stopped = TRUE; - if(device->render) - first = WOD_MarkDoneHeaders(device); - else - first = device->first; + first = device->first; device->first = device->last = device->playing = NULL; device->ofs_bytes = 0; device->played_frames = 0; @@ -1698,6 +1696,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) IAudioClient_Reset(device->client); cb_info = device->cb_info; + is_out = device->render ? TRUE : FALSE; LeaveCriticalSection(&device->lock); @@ -1705,7 +1704,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) WAVEHDR *next = first->lpNext; first->dwFlags &= ~WHDR_INQUEUE; first->dwFlags |= WHDR_DONE; - if(device->render) + if(is_out) WINMM_NotifyClient(&cb_info, WOM_DONE, (DWORD_PTR)first, 0); else WINMM_NotifyClient(&cb_info, WIM_DATA, (DWORD_PTR)first, 0);

1 0

Andrew Talbot : cabinet: Mark some fall-throughs in switch statements.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 73e82bacc35cde8fcea7d93833ea98754fc8dae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e82bacc35cde8fcea7d9383… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 24 16:28:21 2011 +0100 cabinet: Mark some fall-throughs in switch statements. --- dlls/cabinet/fci.c | 3 +++ dlls/cabinet/fdi.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 8ea7c26..70d4f3f 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -466,10 +466,13 @@ static cab_ULONG fci_get_checksum( const void *pv, UINT cb, cab_ULONG seed ) switch (cb % 4) { case 3: ul |= (((ULONG)(*pb++)) << 16); + /* fall through */ case 2: ul |= (((ULONG)(*pb++)) << 8); + /* fall through */ case 1: ul |= *pb; + /* fall through */ default: break; } diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 04a6295..d091dbb 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -360,7 +360,9 @@ static cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum switch (bytes & 3) { case 3: ul |= *data++ << 16; + /* fall through */ case 2: ul |= *data++ << 8; + /* fall through */ case 1: ul |= *data; } csum ^= ul;

1 0