December 2008 - Wine-Commits

Alexandre Julliard : wined3d: Fix some macros definitions to make them proper C statements.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 6800d3dbb758ac2500d743c444cf9804440e13e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6800d3dbb758ac2500d743c44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 10:03:26 2008 +0100 wined3d: Fix some macros definitions to make them proper C statements. --- dlls/wined3d/state.c | 6 +++--- dlls/wined3d/wined3d_private.h | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 355abfe..9e74d49 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3627,12 +3627,12 @@ static void transform_worldex(DWORD state, IWineD3DStateBlockImpl *stateblock, W */ if(stateblock->wineD3DDevice->view_ident) { glLoadMatrixf(&stateblock->transforms[WINED3DTS_WORLDMATRIX(matrix)].u.m[0][0]); - checkGLcall("glLoadMatrixf") + checkGLcall("glLoadMatrixf"); } else { glLoadMatrixf(&stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); - checkGLcall("glLoadMatrixf") + checkGLcall("glLoadMatrixf"); glMultMatrixf(&stateblock->transforms[WINED3DTS_WORLDMATRIX(matrix)].u.m[0][0]); - checkGLcall("glMultMatrixf") + checkGLcall("glMultMatrixf"); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 134e33b..2a6a064 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -402,11 +402,12 @@ extern int num_lock; #define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xFF)) / 255.0f) #define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0xFF)) / 255.0f) -#define D3DCOLORTOGLFLOAT4(dw, vec) \ +#define D3DCOLORTOGLFLOAT4(dw, vec) do { \ (vec)[0] = D3DCOLOR_R(dw); \ (vec)[1] = D3DCOLOR_G(dw); \ (vec)[2] = D3DCOLOR_B(dw); \ - (vec)[3] = D3DCOLOR_A(dw); + (vec)[3] = D3DCOLOR_A(dw); \ +} while(0) /* DirectX Device Limits */ /* --------------------- */ @@ -422,7 +423,7 @@ extern int num_lock; /* --------------------- */ #ifndef WINE_NO_DEBUG_MSGS #define checkGLcall(A) \ -{ \ +do { \ GLint err = glGetError(); \ if (err == GL_NO_ERROR) { \ TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ @@ -432,9 +433,9 @@ extern int num_lock; debug_glerror(err), err, A, __FILE__, __LINE__); \ err = glGetError(); \ } while (err != GL_NO_ERROR); \ -} +} while(0) #else -#define checkGLcall(A) do {} while(0); +#define checkGLcall(A) do {} while(0) #endif /* Trace routines / diagnostics */ @@ -452,13 +453,13 @@ do { /* Macro to dump out the current state of the light chain */ #define DUMP_LIGHT_CHAIN() \ -{ \ +do { \ PLIGHTINFOEL *el = This->stateBlock->lights;\ while (el) { \ TRACE("Light %p (glIndex %ld, d3dIndex %ld, enabled %d)\n", el, el->glIndex, el->OriginalIndex, el->lightEnabled);\ el = el->next; \ } \ -} +} while(0) /* Trace vector and strided data information */ #define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w); @@ -494,7 +495,7 @@ extern const float identity[16]; /* Checking of per-vertex related GL calls */ /* --------------------- */ #define vcheckGLcall(A) \ -{ \ +do { \ GLint err = glGetError(); \ if (err == GL_NO_ERROR) { \ VTRACE(("%s call ok %s / %d\n", A, __FILE__, __LINE__)); \ @@ -504,7 +505,7 @@ extern const float identity[16]; debug_glerror(err), err, A, __FILE__, __LINE__); \ err = glGetError(); \ } while (err != GL_NO_ERROR); \ -} +} while(0) /* TODO: Confirm each of these works when wined3d move completed */ #if 0 /* NOTE: Must be 0 in cvs */

1 0

Jeff Zaroyko : wineserver: Don' t use O_CREAT and O_EXCL when attempting to open directories.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: afce6158304ac4e0cb22bfde4d0f14b2c385cbe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afce6158304ac4e0cb22bfde4… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Wed Dec 3 17:30:54 2008 +1100 wineserver: Don't use O_CREAT and O_EXCL when attempting to open directories. --- dlls/kernel32/tests/file.c | 2 +- server/fd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 56055c0..b045025 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -783,7 +783,7 @@ static void test_CreateFileW(void) ok(ret == TRUE, "couldn't create temporary directory\n"); hFile = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, NULL); - todo_wine ok(hFile != INVALID_HANDLE_VALUE, + ok(hFile != INVALID_HANDLE_VALUE, "expected CreateFile to succeed on existing directory, error: %d\n", GetLastError()); CloseHandle(hFile); ret = RemoveDirectoryW(filename); diff --git a/server/fd.c b/server/fd.c index 0d33e77..f7716d1 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1582,7 +1582,7 @@ struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int acce /* if we tried to open a directory for write access, retry read-only */ if (errno != EISDIR || !(access & FILE_UNIX_WRITE_ACCESS) || - (fd->unix_fd = open( name, O_RDONLY | (flags & ~O_TRUNC), *mode )) == -1) + (fd->unix_fd = open( name, O_RDONLY | (flags & ~(O_TRUNC | O_CREAT | O_EXCL)), *mode )) == -1) { file_set_error(); goto error;

1 0

Jeff Zaroyko : kernel32: Add a test for CreateFile when using OPEN_ALWAYS on directories.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: f8b5aa34dc4f4681a151cdc07afab3316be7063e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b5aa34dc4f4681a151cdc07… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Wed Dec 3 17:03:26 2008 +1100 kernel32: Add a test for CreateFile when using OPEN_ALWAYS on directories. --- dlls/kernel32/tests/file.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 7297662..56055c0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -778,6 +778,16 @@ static void test_CreateFileW(void) OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND, "CreateFileW on invalid VxD name returned ret=%p error=%d\n",hFile,GetLastError()); + + ret = CreateDirectoryW(filename, NULL); + ok(ret == TRUE, "couldn't create temporary directory\n"); + hFile = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, NULL); + todo_wine ok(hFile != INVALID_HANDLE_VALUE, + "expected CreateFile to succeed on existing directory, error: %d\n", GetLastError()); + CloseHandle(hFile); + ret = RemoveDirectoryW(filename); + ok(ret, "DeleteFileW: error %d\n", GetLastError()); } static void test_GetTempFileNameA(void)

1 0

Dmitry Timoshkov : gdi32: Make PATH_AddEntry static.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 1669b337e490562c2db05bac4cbae89c6caf908e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1669b337e490562c2db05bac4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 3 13:26:24 2008 +0800 gdi32: Make PATH_AddEntry static. --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/path.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 325c708..ba07217 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -511,7 +511,6 @@ extern BOOL PATH_Polygon(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN extern BOOL PATH_PolyPolyline(DC *dc, const POINT *pt, const DWORD *counts, DWORD polylines) DECLSPEC_HIDDEN; extern BOOL PATH_PolyPolygon(DC *dc, const POINT *pt, const INT *counts, UINT polygons) DECLSPEC_HIDDEN; extern BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height) DECLSPEC_HIDDEN; -extern BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags) DECLSPEC_HIDDEN; /* painting.c */ extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 1e953cb..8df8a1b 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -92,6 +92,7 @@ typedef struct tagFLOAT_POINT } FLOAT_POINT; +static BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags); static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn); static void PATH_EmptyPath(GdiPath *pPath); @@ -1502,7 +1503,7 @@ static void PATH_EmptyPath(GdiPath *pPath) * or PT_BEZIERTO, optionally ORed with PT_CLOSEFIGURE. Returns TRUE if * successful, FALSE otherwise (e.g. if not enough memory was available). */ -BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags) +static BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags) { assert(pPath!=NULL);

1 0

Andrew Riedi : imm32: Add some really basic tests for ImmSetCompositionString().
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: acac1a5b105c1e4c32bb1afd9f9915b58a562d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acac1a5b105c1e4c32bb1afd9… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Dec 2 20:08:15 2008 -0800 imm32: Add some really basic tests for ImmSetCompositionString(). --- dlls/imm32/tests/imm32.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 35c154b..f56437c 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -251,6 +251,47 @@ static void test_ImmGetCompositionString(void) ImmReleaseContext(hwnd, imc); } +static void test_ImmSetCompositionString(void) +{ + HIMC imc; + BOOL ret; + + SetLastError(0xdeadbeef); + imc = ImmGetContext(hwnd); + ok(imc, "ImmGetContext() failed. Last error: %u\n", GetLastError()); + if (!imc) + return; + + SetLastError(0xdeadbeef); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 0, NULL, 0); + todo_wine + ok(!ret, "ImmSetCompositionStringW() failed. Last error: %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR, + NULL, 0, NULL, 0); + todo_wine + ok(!ret, "ImmSetCompositionStringW() failed. Last error: %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGECLAUSE, + NULL, 0, NULL, 0); + todo_wine + ok(!ret, "ImmSetCompositionStringW() failed. Last error: %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = ImmSetCompositionStringW(imc, SCS_CHANGEATTR | SCS_CHANGECLAUSE, + NULL, 0, NULL, 0); + todo_wine + ok(!ret, "ImmSetCompositionStringW() failed. Last error: %u\n", + GetLastError()); + + ImmReleaseContext(hwnd, imc); +} + static void test_ImmIME(void) { HIMC imc; @@ -272,6 +313,7 @@ START_TEST(imm32) { { test_ImmNotifyIME(); test_ImmGetCompositionString(); + test_ImmSetCompositionString(); test_ImmIME(); } cleanup();

1 0

Andrew Riedi : imm32: No need for tests to return 0.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 625dca9d62ca6bc4625f3376777c453080cba68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=625dca9d62ca6bc4625f33767… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Dec 2 19:59:03 2008 -0800 imm32: No need for tests to return 0. --- dlls/imm32/tests/imm32.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 29ac553..35c154b 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -182,7 +182,7 @@ static void cleanup(void) { UnregisterClass(wndcls, GetModuleHandle(0)); } -static int test_ImmNotifyIME(void) { +static void test_ImmNotifyIME(void) { static const char string[] = "wine"; char resstr[16] = ""; HIMC imc; @@ -225,11 +225,9 @@ static int test_ImmNotifyIME(void) { msg_spy_flush_msgs(); ImmReleaseContext(hwnd, imc); - - return 0; } -static int test_ImmGetCompositionString(void) +static void test_ImmGetCompositionString(void) { HIMC imc; static const WCHAR string[] = {'w','i','n','e',0x65e5,0x672c,0x8a9e}; @@ -251,10 +249,9 @@ static int test_ImmGetCompositionString(void) ok(len==alen,"GCS_COMPATTR(A) not returning correct count\n"); } ImmReleaseContext(hwnd, imc); - return 0; } -static int test_ImmIME(void) +static void test_ImmIME(void) { HIMC imc; @@ -268,7 +265,6 @@ static int test_ImmIME(void) ok (rc == 0, "ImmConfigureIMEW did not fail\n"); } ImmReleaseContext(hwnd,imc); - return 0; } START_TEST(imm32) {

1 0

Christian Costa : ddraw: Fix some comments.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 9d3026ff402f442a27ba7fc6895ce54fd5e09ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3026ff402f442a27ba7fc68… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 2 20:30:41 2008 +0100 ddraw: Fix some comments. --- dlls/ddraw/ddraw.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4f23722..cdb33d9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3567,8 +3567,9 @@ const IDirectDraw7Vtbl IDirectDraw7_Vtbl = IDirectDrawImpl_WaitForVerticalBlank, /*** IDirectDraw2 ***/ IDirectDrawImpl_GetAvailableVidMem, - /*** IDirectDraw7 ***/ + /*** IDirectDraw3 ***/ IDirectDrawImpl_GetSurfaceFromDC, + /*** IDirectDraw4 ***/ IDirectDrawImpl_RestoreAllSurfaces, IDirectDrawImpl_TestCooperativeLevel, IDirectDrawImpl_GetDeviceIdentifier,

1 0

Christian Costa : quartz: Return properly when input is flushing or reaching end of stream.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 50fda76b405828e0c8ddd4e9ba52aea3b19e3f4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50fda76b405828e0c8ddd4e9b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 2 20:29:48 2008 +0100 quartz: Return properly when input is flushing or reaching end of stream. --- dlls/quartz/videorenderer.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index acd0ba2..437779c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -355,9 +355,14 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; HRESULT hr; + EnterCriticalSection(&This->csFilter); + if (This->pInputPin->flushing || This->pInputPin->end_of_stream) - hr = S_FALSE; + { + LeaveCriticalSection(&This->csFilter); + return S_FALSE; + } if (This->state == State_Stopped) {

1 0

Henri Verbeet : wined3d: Disable checkGLcall when WINE_NO_DEBUG_MSGS is specified.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 5284fce1ac25c4348e002c074612d8d389875ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5284fce1ac25c4348e002c074… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 2 18:41:33 2008 +0100 wined3d: Disable checkGLcall when WINE_NO_DEBUG_MSGS is specified. --- dlls/wined3d/wined3d_private.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ad75c9..134e33b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -420,6 +420,7 @@ extern int num_lock; /* Checking of API calls */ /* --------------------- */ +#ifndef WINE_NO_DEBUG_MSGS #define checkGLcall(A) \ { \ GLint err = glGetError(); \ @@ -431,7 +432,10 @@ extern int num_lock; debug_glerror(err), err, A, __FILE__, __LINE__); \ err = glGetError(); \ } while (err != GL_NO_ERROR); \ -} +} +#else +#define checkGLcall(A) do {} while(0); +#endif /* Trace routines / diagnostics */ /* ---------------------------- */

1 0

Henri Verbeet : wined3d: Use a bitmask to store which bool and int constants are set.
by Alexandre Julliard Dec. 3, 2008

Dec. 3, 2008

Module: wine Branch: master Commit: 70968e69acfbde63fe7a2e5bc61c09ac41d2a5e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70968e69acfbde63fe7a2e5bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 2 18:41:33 2008 +0100 wined3d: Use a bitmask to store which bool and int constants are set. Note that constants_set was never actually NULL for shader_glsl_load_constantsB() and shader_glsl_load_constantsI(). --- dlls/wined3d/device.c | 28 ++++++++------ dlls/wined3d/glsl_shader.c | 80 +++++++++++++++++---------------------- dlls/wined3d/stateblock.c | 16 ++++---- dlls/wined3d/wined3d_private.h | 8 ++-- 4 files changed, 63 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70968e69acfbde63fe7a2…

1 0