September 2011 - Wine-Commits

Jörg Höhle : wineoss: Simplify the test for 8bit linear PCM.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

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: Separate WINMM_Pause and WINMM_Reset.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

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

Andrew Talbot : d3dcompiler_43: Mark fall-throughs in switch statement.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 5c7ba2c330deb395a0aaa9c510809d70450d2dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7ba2c330deb395a0aaa9c51… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 24 16:28:35 2011 +0100 d3dcompiler_43: Mark fall-throughs in switch statement. --- dlls/d3dcompiler_43/asmparser.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index ee4ba18..4d71237 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -1327,12 +1327,19 @@ static void gen_oldvs_output(struct bwriter_shader *shader) { static void gen_oldps_input(struct bwriter_shader *shader, DWORD texcoords) { switch(texcoords) { case 8: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 7, 0, FALSE, T7_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 7: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 6, 0, FALSE, T6_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 6: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 5, 0, FALSE, T5_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 5: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 4, 0, FALSE, T4_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 4: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 3, 0, FALSE, T3_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 3: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 2, 0, FALSE, T2_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 2: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 1, 0, FALSE, T1_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 1: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 0, 0, FALSE, T0_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); }; record_declaration(shader, BWRITERDECLUSAGE_COLOR, 0, 0, FALSE, C0_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE);

1 0

André Hentschel : d3d9/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 3c9aa222896c070c72a77b58378f96d5e92c55a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9aa222896c070c72a77b583… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:36 2011 +0200 d3d9/tests: Don't test function directly when reporting GetLastError(). --- dlls/d3d9/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 482f5d4..bf15792 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2858,6 +2858,7 @@ static void test_reset_fullscreen(void) WNDCLASSEX wc = {0}; IDirect3DDevice9 *device = NULL; IDirect3D9 *d3d = NULL; + ATOM atom; static const struct message messages[] = { {WM_ACTIVATEAPP, FOCUS_WINDOW}, @@ -2872,7 +2873,8 @@ static void test_reset_fullscreen(void) wc.lpfnWndProc = test_proc; wc.lpszClassName = "test_reset_fullscreen"; - ok(RegisterClassEx(&wc), "Failed to register a new window class. GetLastError:%d\n", GetLastError()); + atom = RegisterClassEx(&wc); + ok(atom, "Failed to register a new window class. GetLastError:%d\n", GetLastError()); device_window = focus_window = CreateWindowEx(0, wc.lpszClassName, "Test Reset Fullscreen", 0, 0, 0, screen_width, screen_height, NULL, NULL, NULL, NULL); ok(device_window != NULL, "Failed to create a window. GetLastError:%d\n", GetLastError());

1 0

Andrew Talbot : cabinet: Mark some fall-throughs in switch statements.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

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

Andrew Talbot : d3d10: Mark a fall-through in a switch statement.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: f9b424e919cc2e1ff96f6bd8b556dbf0ff210167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b424e919cc2e1ff96f6bd8b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 24 16:28:32 2011 +0100 d3d10: Mark a fall-through in a switch statement. --- dlls/d3d10/d3d10_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 9076b0a..af792d4 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -84,6 +84,7 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver case D3D10_DRIVER_TYPE_NULL: FIXME("NULL device not implemented, falling back to refrast\n"); + /* fall through, for now */ case D3D10_DRIVER_TYPE_REFERENCE: { HMODULE refrast = LoadLibraryA("d3d10ref.dll");

1 0

Andrew Talbot : ddeml.dll16: Move break outside of if statement.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 150a3308b9f397f20b496789e6d453b106292266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=150a3308b9f397f20b496789e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 24 16:28:39 2011 +0100 ddeml.dll16: Move break outside of if statement. --- dlls/ddeml.dll16/ddeml.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index 90362ca..94c947b 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -113,7 +113,6 @@ static HDDEDATA CALLBACK WDML_InvokeCallback16(DWORD pfn16, UINT uType, UINT uFm map3216_conv_context(&cc16, (const CONVCONTEXT*)dwData1); d1 = MapLS(&cc16); } - else break; default: d1 = dwData1;

1 0

Andrew Talbot : comdlg32: Add a break statement to mark a semantic separation.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 1e59ecf25433fbdb9edaa2cec1728d5dcfb4e28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e59ecf25433fbdb9edaa2cec… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 24 16:28:28 2011 +0100 comdlg32: Add a break statement to mark a semantic separation. --- dlls/comdlg32/itemdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index bc309c9..9e90276 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -647,6 +647,7 @@ static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl) GetWindowRect(ctrl->hwnd, &rc); SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top, SWP_NOZORDER|SWP_NOMOVE|SWP_NOZORDER); + break; case IDLG_CCTRL_RADIOBUTTONLIST: case IDLG_CCTRL_EDITBOX: case IDLG_CCTRL_SEPARATOR:

1 0

Jörg Höhle : winealsa: Simplify the test for 8bit linear PCM.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

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

Marcus Meissner : wpp: Add semicolons at end of code rules.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

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