April 2011 - Wine-commits - list.winehq.org

Eric Pouech : services: Be sure to unlock the current database in all error cases in service_start_process .
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: 0b9ddd1ce4b261ce680dd93e8cce9a0a45895c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9ddd1ce4b261ce680dd93e8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 23 22:20:54 2011 +0200 services: Be sure to unlock the current database in all error cases in service_start_process. --- programs/services/services.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index eab532f..5d0e4be 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -575,7 +575,11 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0); path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); - if (!path) return ERROR_NOT_ENOUGH_SERVER_MEMORY; + if (!path) + { + service_unlock(service_entry); + return ERROR_NOT_ENOUGH_SERVER_MEMORY; + } ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,path,size); if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER) @@ -590,6 +594,7 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * if (!GetBinaryTypeW( path, &type )) { HeapFree( GetProcessHeap(), 0, path ); + service_unlock(service_entry); return GetLastError(); } if (type == SCS_32BIT_BINARY) GetSystemWow64DirectoryW( system_dir, MAX_PATH ); @@ -598,7 +603,10 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * len = strlenW( system_dir ) + sizeof(winedeviceW)/sizeof(WCHAR) + strlenW(service_entry->name); HeapFree( GetProcessHeap(), 0, path ); if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + service_unlock(service_entry); return ERROR_NOT_ENOUGH_SERVER_MEMORY; + } lstrcpyW( path, system_dir ); lstrcatW( path, winedeviceW ); lstrcatW( path, service_entry->name );

1 0

Eric Pouech : msvcrt: Added tests in fileops with different buffer management modes.
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: dc9904a3385223ffaac09fb6aa09deeb62926e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9904a3385223ffaac09fb6a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Apr 24 11:01:48 2011 +0200 msvcrt: Added tests in fileops with different buffer management modes. --- dlls/msvcrt/tests/file.c | 98 ++++++++++++++++++++++++++------------------- 1 files changed, 57 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index f70285b..5aaaaf7 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -106,54 +106,70 @@ static void test_fileops( void ) int fd; FILE *file; fpos_t pos; - int i, c; + int i, c, bufmode; + static const int bufmodes[] = {_IOFBF,_IONBF}; fd = open ("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); write (fd, outbuffer, sizeof (outbuffer)); close (fd); - fd = open ("fdopen.tst", O_RDONLY | O_BINARY); - file = fdopen (fd, "rb"); - ok(strlen(outbuffer) == (sizeof(outbuffer)-1),"strlen/sizeof error\n"); - ok(fgets(buffer,sizeof(buffer),file) !=0,"fgets failed unexpected\n"); - ok(fgets(buffer,sizeof(buffer),file) ==0,"fgets didn't signal EOF\n"); - ok(feof(file) !=0,"feof doesn't signal EOF\n"); - rewind(file); - ok(fgets(buffer,strlen(outbuffer),file) !=0,"fgets failed unexpected\n"); - ok(lstrlenA(buffer) == lstrlenA(outbuffer) -1,"fgets didn't read right size\n"); - ok(fgets(buffer,sizeof(outbuffer),file) !=0,"fgets failed unexpected\n"); - ok(strlen(buffer) == 1,"fgets dropped chars\n"); - ok(buffer[0] == outbuffer[strlen(outbuffer)-1],"fgets exchanged chars\n"); - - rewind(file); - for (i = 0, c = EOF; i < sizeof(outbuffer); i++) + for (bufmode=0; bufmode < sizeof(bufmodes)/sizeof(bufmodes[0]); bufmode++) { - ok((c = fgetc(file)) == outbuffer[i], "fgetc returned wrong data\n"); + fd = open ("fdopen.tst", O_RDONLY | O_BINARY); + file = fdopen (fd, "rb"); + setvbuf(file,NULL,bufmodes[bufmode],2048); + ok(strlen(outbuffer) == (sizeof(outbuffer)-1),"strlen/sizeof error for bufmode=%x\n", bufmodes[bufmode]); + ok(fgets(buffer,sizeof(buffer),file) !=0,"fgets failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(fgets(buffer,sizeof(buffer),file) ==0,"fgets didn't signal EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(feof(file) !=0,"feof doesn't signal EOF for bufmode=%x\n", bufmodes[bufmode]); + rewind(file); + ok(fgets(buffer,strlen(outbuffer),file) !=0,"fgets failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(lstrlenA(buffer) == lstrlenA(outbuffer) -1,"fgets didn't read right size for bufmode=%x\n", bufmodes[bufmode]); + ok(fgets(buffer,sizeof(outbuffer),file) !=0,"fgets failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(strlen(buffer) == 1,"fgets dropped chars for bufmode=%x\n", bufmodes[bufmode]); + ok(buffer[0] == outbuffer[strlen(outbuffer)-1],"fgets exchanged chars for bufmode=%x\n", bufmodes[bufmode]); + + rewind(file); + for (i = 0, c = EOF; i < sizeof(outbuffer); i++) + { + ok((c = fgetc(file)) == outbuffer[i], "fgetc returned wrong data for bufmode=%x\n", bufmodes[bufmode]); + } + ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(feof(file), "feof did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(ungetc(c, file) == EOF, "ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(feof(file), "feof after ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + c = outbuffer[sizeof(outbuffer) - 1]; + if (bufmodes[bufmode] == _IONBF) todo_wine { + ok(ungetc(c, file) == c, "ungetc did not return its input for bufmode=%x\n", bufmodes[bufmode]); + ok(!feof(file), "feof after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); + ok((c = fgetc(file)) != EOF, "getc after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(c == outbuffer[sizeof(outbuffer) - 1], + "getc did not return ungetc'd data for bufmode=%x\n", bufmodes[bufmode]); + ok(!feof(file), "feof after getc returned EOF prematurely for bufmode=%x\n", bufmodes[bufmode]); + } + else + { + ok(ungetc(c, file) == c, "ungetc did not return its input for bufmode=%x\n", bufmodes[bufmode]); + ok(!feof(file), "feof after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); + ok((c = fgetc(file)) != EOF, "getc after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(c == outbuffer[sizeof(outbuffer) - 1], + "getc did not return ungetc'd data for bufmode=%x\n", bufmodes[bufmode]); + ok(!feof(file), "feof after getc returned EOF prematurely for bufmode=%x\n", bufmodes[bufmode]); + } + ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(feof(file), "feof after getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + + rewind(file); + ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(pos == 0, "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + pos = sizeof (outbuffer); + ok(fsetpos(file, &pos) == 0, "fsetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + + fclose (file); } - ok((c = fgetc(file)) == EOF, "getc did not return EOF\n"); - ok(feof(file), "feof did not return EOF\n"); - ok(ungetc(c, file) == EOF, "ungetc(EOF) did not return EOF\n"); - ok(feof(file), "feof after ungetc(EOF) did not return EOF\n"); - ok((c = fgetc(file)) == EOF, "getc did not return EOF\n"); - c = outbuffer[sizeof(outbuffer) - 1]; - ok(ungetc(c, file) == c, "ungetc did not return its input\n"); - ok(!feof(file), "feof after ungetc returned EOF\n"); - ok((c = fgetc(file)) != EOF, "getc after ungetc returned EOF\n"); - ok(c == outbuffer[sizeof(outbuffer) - 1], - "getc did not return ungetc'd data\n"); - ok(!feof(file), "feof after getc returned EOF prematurely\n"); - ok((c = fgetc(file)) == EOF, "getc did not return EOF\n"); - ok(feof(file), "feof after getc did not return EOF\n"); - - rewind(file); - ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected\n"); - ok(pos == 0, "Unexpected result of fgetpos %x%08x\n", (DWORD)(pos >> 32), (DWORD)pos); - pos = sizeof (outbuffer); - ok(fsetpos(file, &pos) == 0, "fsetpos failed unexpected\n"); - ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected\n"); - ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %x%08x\n", (DWORD)(pos >> 32), (DWORD)pos); - - fclose (file); fd = open ("fdopen.tst", O_RDONLY | O_TEXT); file = fdopen (fd, "rt"); /* open in TEXT mode */ ok(fgetws(wbuffer,sizeof(wbuffer)/sizeof(wbuffer[0]),file) !=0,"fgetws failed unexpected\n");

1 0

Eric Pouech : msvcrt: ungetc must create a buffer, even if _IONBF has been set with setvbuf.
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: a42bf0134c74cd1971750812b0df18b6e8ffacdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42bf0134c74cd1971750812b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Apr 24 11:01:59 2011 +0200 msvcrt: ungetc must create a buffer, even if _IONBF has been set with setvbuf. --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 11 ----------- 2 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c1a7785..e34c11f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3622,7 +3622,7 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) { if (c == MSVCRT_EOF) return MSVCRT_EOF; - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { + if(file->_bufsiz == 0) { msvcrt_alloc_buffer(file); file->_ptr++; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 5aaaaf7..0231f72 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -140,23 +140,12 @@ static void test_fileops( void ) ok(feof(file), "feof after ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); c = outbuffer[sizeof(outbuffer) - 1]; - if (bufmodes[bufmode] == _IONBF) todo_wine { ok(ungetc(c, file) == c, "ungetc did not return its input for bufmode=%x\n", bufmodes[bufmode]); ok(!feof(file), "feof after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); ok((c = fgetc(file)) != EOF, "getc after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); ok(c == outbuffer[sizeof(outbuffer) - 1], "getc did not return ungetc'd data for bufmode=%x\n", bufmodes[bufmode]); ok(!feof(file), "feof after getc returned EOF prematurely for bufmode=%x\n", bufmodes[bufmode]); - } - else - { - ok(ungetc(c, file) == c, "ungetc did not return its input for bufmode=%x\n", bufmodes[bufmode]); - ok(!feof(file), "feof after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); - ok((c = fgetc(file)) != EOF, "getc after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); - ok(c == outbuffer[sizeof(outbuffer) - 1], - "getc did not return ungetc'd data for bufmode=%x\n", bufmodes[bufmode]); - ok(!feof(file), "feof after getc returned EOF prematurely for bufmode=%x\n", bufmodes[bufmode]); - } ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof after getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]);

1 0

Michael Stefaniuc : d3d9: Use impl_from_IDirect3DDevice9Ex instead of casting iface to object.
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: e798c72cf4ec10a1cfb75edcf4234b56b2ed3806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e798c72cf4ec10a1cfb75edcf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 24 21:24:51 2011 +0200 d3d9: Use impl_from_IDirect3DDevice9Ex instead of casting iface to object. --- dlls/d3d9/device.c | 550 ++++++++++++++++++++++++++++++++------------------- 1 files changed, 345 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e798c72cf4ec10a1cfb75…

1 0

Michael Stefaniuc : d3d9: Pass an object instead of an iface to IDirect3DDevice9Impl_CreateSurface() .
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: 5f57cc14519924075b3a964b3d78cf4bdd89b9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f57cc14519924075b3a964b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 24 21:27:59 2011 +0200 d3d9: Pass an object instead of an iface to IDirect3DDevice9Impl_CreateSurface(). --- dlls/d3d9/device.c | 59 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 08346bf..c316e8c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -935,18 +935,18 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex return D3D_OK; } -static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, - D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface, - UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality) +static HRESULT IDirect3DDevice9Impl_CreateSurface(IDirect3DDevice9Impl *device, UINT Width, + UINT Height, D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, + IDirect3DSurface9 **ppSurface, UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, + DWORD MultisampleQuality) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *object; HRESULT hr; - TRACE("iface %p, width %u, height %u, format %#x, lockable %#x, discard %#x, level %u, surface %p.\n" + TRACE("device %p, width %u, height %u, format %#x, lockable %#x, discard %#x, level %u, surface %p.\n" "usage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", - iface, Width, Height, Format, Lockable, Discard, Level, ppSurface, - Usage, Pool, MultiSample, MultisampleQuality); + device, Width, Height, Format, Lockable, Discard, Level, ppSurface, Usage, Pool, + MultiSample, MultisampleQuality); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface9Impl)); if (!object) @@ -955,8 +955,8 @@ static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UIN return D3DERR_OUTOFVIDEOMEMORY; } - hr = surface_init(object, This, Width, Height, Format, Lockable, Discard, - Level, Usage, Pool, MultiSample, MultisampleQuality); + hr = surface_init(object, device, Width, Height, Format, Lockable, Discard, Level, Usage, Pool, + MultiSample, MultisampleQuality); if (FAILED(hr)) { WARN("Failed to initialize surface, hr %#x.\n", hr); @@ -970,10 +970,11 @@ static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UIN return D3D_OK; } -static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(IDirect3DDevice9Ex *iface, UINT Width, UINT Height, - D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Lockable, - IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle) +static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(IDirect3DDevice9Ex *iface, UINT Width, + UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, + BOOL Lockable, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle) { + IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n" @@ -981,16 +982,19 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(IDirect3DDevice9Ex iface, Width, Height, Format, MultiSample, MultisampleQuality, Lockable, ppSurface, pSharedHandle); - hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */, - 0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality); + hr = IDirect3DDevice9Impl_CreateSurface(This, Width, Height, Format, Lockable, + FALSE /* Discard */, 0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, + MultiSample, MultisampleQuality); return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, - D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, - DWORD MultisampleQuality, BOOL Discard, - IDirect3DSurface9 **ppSurface, HANDLE* pSharedHandle) { +static HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(IDirect3DDevice9Ex *iface, + UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, + DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, + HANDLE *pSharedHandle) +{ + IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n" @@ -998,8 +1002,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(LPDIRECT3 iface, Width, Height, Format, MultiSample, MultisampleQuality, Discard, ppSurface, pSharedHandle); - hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, Discard, - 0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality); + hr = IDirect3DDevice9Impl_CreateSurface(This, Width, Height, Format, TRUE /* Lockable */, + Discard, 0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, + MultisampleQuality); return hr; } @@ -1128,7 +1133,11 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE* pSharedHandle) { +static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(IDirect3DDevice9Ex *iface, + UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, + HANDLE *pSharedHandle) +{ + IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; TRACE("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p.\n", @@ -1145,9 +1154,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(LPDIREC Why, their always lockable? should I change the usage to dynamic? */ - hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE /* Discard */, - 0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, (WINED3DPOOL)Pool, D3DMULTISAMPLE_NONE, - 0 /* MultisampleQuality */); + hr = IDirect3DDevice9Impl_CreateSurface(This, Width, Height, Format, TRUE /* Lockable */, + FALSE /* Discard */, 0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, + (WINED3DPOOL)Pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */); return hr; } @@ -3174,7 +3183,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen if (pool == WINED3DPOOL_DEFAULT && !(usage & D3DUSAGE_DYNAMIC)) lockable = FALSE; - hr = IDirect3DDevice9Impl_CreateSurface((IDirect3DDevice9Ex *)This, width, height, + hr = IDirect3DDevice9Impl_CreateSurface(This, width, height, d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level, (IDirect3DSurface9 **)&d3d_surface, usage, pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */); if (FAILED(hr))

1 0

Michael Stefaniuc : d3d9: Finish the COM cleanup of the IDirect3DDevice9Ex iface.
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: d5739cd2c33eb8c3e2a21be5f010bc34f74bfedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5739cd2c33eb8c3e2a21be5f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 24 21:34:30 2011 +0200 d3d9: Finish the COM cleanup of the IDirect3DDevice9Ex iface. --- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/d3d9_private.h | 10 +++------- dlls/d3d9/device.c | 28 +++++++++++++++------------- dlls/d3d9/directx.c | 2 +- dlls/d3d9/query.c | 2 +- dlls/d3d9/shader.c | 4 ++-- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/swapchain.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexdeclaration.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- 13 files changed, 31 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5739cd2c33eb8c3e2a21…

1 0

Alexander Nicolaysen Sørnes : note: Delete all links to a note when deleting it
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 2a1258ae22b45274705d62f65bb4e8832b422662 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2a1258ae22b45274705d62f6… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Mon Apr 25 01:47:23 2011 +0200 note: Delete all links to a note when deleting it --- include/note.php | 3 +++ include/tag.php | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index c156b24..96cfcbb 100644 --- a/include/note.php +++ b/include/note.php @@ -188,6 +188,9 @@ class Note { if(!$hResult) return FALSE; + $oTag = new TagNoteVersion($this->iVersionId); + $oTag->deleteAssignments($this->iNoteId); + return TRUE; } diff --git a/include/tag.php b/include/tag.php index c9fac08..3970b01 100644 --- a/include/tag.php +++ b/include/tag.php @@ -55,6 +55,16 @@ abstract class Tag extends ObjectManagerBase return $this->objectGetSQLTable().'_assignments'; } + public function deleteAssignments($iId) + { + $hResult = query_parameters("UPDATE ? SET state = 'deleted' WHERE taggedId = '?'", $this->getSQLTableForAssignments(), $iId); + + if(!$hResult) + return false; + + return true; + } + public function removeAssignment($iId) { $hResult = query_parameters("DELETE FROM ? WHERE tagId = '?' AND taggedId = '?'", $this->getSQLTableForAssignments(), $this->iId, $iId); @@ -98,7 +108,7 @@ abstract class Tag extends ObjectManagerBase public function getTaggedEntries() { - $hResult = query_parameters("SELECT taggedId FROM ? WHERE tagId = '?'", $this->getSQLTableForAssignments(), $this->iId); + $hResult = query_parameters("SELECT taggedId FROM ? WHERE tagId = '?' AND state = 'accepted'", $this->getSQLTableForAssignments(), $this->iId); if(!$hResult) return array();

1 0

Alexander Nicolaysen Sørnes : note: Select note style based on radiobuttons instead of special title names
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 2cada372455b3d0f62be24d639d57ec1314cfc1a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2cada372455b3d0f62be24d6… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Mon Apr 25 01:15:31 2011 +0200 note: Select note style based on radiobuttons instead of special title names --- application.css | 4 ++++ include/html.php | 7 +++++-- include/note.php | 34 ++++++++++++++++++++++++++-------- include/version.php | 8 +------- tables/appdb_tables.sql | 1 + 5 files changed, 37 insertions(+), 17 deletions(-) diff --git a/application.css b/application.css index 91e29d8..92c0f3b 100644 --- a/application.css +++ b/application.css @@ -66,6 +66,10 @@ div.info_contents { padding:10px; background-color: #eee; } div.title_class { font-weight: bold; border-bottom: 1px solid; padding: 4px; font-size: 140%; background-color: #ddd; } +div.warning { display: inline; background-color: #ff3333; } /* novascotia salmon */ +div.howto { display: inline; background-color: green; } +div.defaultnote { display: inline; background-color: #0066CC; } /* mid-light blue */ + /* Classes for a note box */ div.note_container { margin:6px; border: 1px solid; } div.note_body { padding: 10px; background-color: #ffe732; } diff --git a/include/html.php b/include/html.php index 22a2861..21992ae 100644 --- a/include/html.php +++ b/include/html.php @@ -288,7 +288,7 @@ function html_note($shTitle, $shBody) return $shRet; } -function html_radiobuttons($aIds, $aOptions, $sName, $sDefault = '') +function html_radiobuttons($aIds, $aOptions, $sName, $sDefault = '', $bLineBreaks = true) { $shRet = ''; @@ -299,7 +299,10 @@ function html_radiobuttons($aIds, $aOptions, $sName, $sDefault = '') else $shChecked = ''; - $shRet .= '<input type="radio" name="'.$sName.'" value="'.$aIds[$i]."\"$shChecked> " . $aOptions[$i].'<br />'; + $shRet .= '<input type="radio" name="'.$sName.'" value="'.$aIds[$i]."\"$shChecked> " . $aOptions[$i]; + + if($bLineBreaks) + $shRet .= '<br />'; } return $shRet; diff --git a/include/note.php b/include/note.php index fae7995..c156b24 100644 --- a/include/note.php +++ b/include/note.php @@ -25,6 +25,7 @@ class Note { var $iSubmitterId; var $sSubmitTime; private $aVersions; + protected $sType; /** * Constructor. @@ -53,6 +54,7 @@ class Note { $this->shDescription = $oRow->noteDesc; $this->sSubmitTime = $oRow->submitTime; $this->iSubmitterId = $oRow->submitterId; + $this->sType = $oRow->type; } } @@ -66,12 +68,12 @@ class Note { { $hResult = query_parameters("INSERT INTO appNotes (versionId, ". "appId, noteTitle, noteDesc, submitterId, ". - "submitTime) ". - "VALUES('?', '?', '?', '?', '?', ?)", + "submitTime,type) ". + "VALUES('?', '?', '?', '?', '?', ?, '?')", $this->iVersionId, $this->iAppId, $this->sTitle, $this->shDescription, $_SESSION['current']->iUserId, - "NOW()"); + "NOW()", $this->sType); if($hResult) { @@ -147,6 +149,14 @@ class Note { return false; } + if ($this->sType != $oNote->sType) + { + if(!query_parameters("UPDATE appNotes SET type = '?' WHERE noteId = '?'", $this->sType, $this->iNoteId)) + return false; + + $sWhatChanged .= "Type was changed from {$oNote->sType} to {$this->sType}\n\n"; + } + if($sWhatChanged) $this->SendNotificationMail("edit",$sWhatChanged); @@ -243,14 +253,14 @@ class Note { /* the user has the ability to edit this note */ function display($aVars = null) { - switch($this->sTitle) + switch($this->sType) { - case 'WARNING': + case 'warning': $sClass = 'warning'; $sTitle = 'Warning'; break; - case 'HOWTO': + case 'howto': $sClass = 'howto'; $sTitle = 'HOWTO'; break; @@ -264,6 +274,8 @@ class Note { $sClass = 'defaultnote'; } + $sTitle = $this->sTitle ? $this->sTitle : $sTitle; + if(!$aVars || !getInput('shReturnTo', $aVars)) { $oVersion = new version($this->iVersionId); @@ -389,13 +401,18 @@ class Note { echo '<tr><td class=color1>Title</td>'."\n"; echo ' <td class=color0><input size=80% type="text" name="sNoteTitle" type="text" value="'.$this->sTitle.'"></td></tr>',"\n"; - echo '<tr><td class=color4>Description</td><td class=color0>', "\n"; + echo '<tr><td class="color4">Show as</td><td>'; + $aIds = array('howto','note','warning'); + $aNames = array('<div class="howto">How-to</div>','<div class="defaultnote">Note</div>','<div class="warning">Warning</div>'); + echo html_radiobuttons($aIds, $aNames, 'sType', $this->sType, false); + echo '</td></tr>'; + echo '<tr><td class=color1>Description</td><td class=color0>', "\n"; echo '<p style="width:700px">', "\n"; echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc">'.$this->shDescription.'</textarea>',"\n"; echo '</p>'; echo '</td></tr>'."\n"; - echo '<tr><td class="color1">Display options</td>'."\n"; + echo '<tr><td class="color4">Display options</td>'."\n"; echo '<td class="color0">'; $oTag = new TagNoteVersion($this->iVersionId); @@ -450,6 +467,7 @@ class Note { $this->sTitle = $aValues['sNoteTitle']; $this->shDescription = $aValues['shNoteDesc']; + $this->sType = in_array($aValues['sType'], array('howto','note','warning')) ? $aValues['sType'] : 'note'; } function allowAnonymousSubmissions() diff --git a/include/version.php b/include/version.php index a66fd87..6708802 100644 --- a/include/version.php +++ b/include/version.php @@ -1009,14 +1009,8 @@ class version { echo "\t".'<input type=submit value="Delete version" class="button">'."\n"; echo '</form>'."\n"; echo $shAdd.'" />'; - echo "\t".'<input type="submit" value="Add note" class="button">'."\n"; + echo "\t".'<input type="submit" value="Add note/how-to" class="button">'."\n"; echo '</form>'."\n"; - echo $shAdd.'&sNoteTitle=HOWTO" />'; - echo "\t".'<input type=submit value="Add how-to" class="button">'."\n"; - echo '</form>'."\n"; - echo $shAdd.'&sNoteTitle=WARNING" />'; - echo "\t".'<input type=submit value="Add warning" class="button">'."\n"; - echo '</form>'; echo "</td></tr>"; } $oMonitor = new Monitor(); diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index fb32e52..fc4630f 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -173,6 +173,7 @@ create table appNotes ( appId int not null, submitterId int not null, submitTime datetime not null, + type enum('note','howto','warning') not null default 'note', key(noteId) );

1 0

Alexander Nicolaysen Sørnes : TagNoteVersion: Add class for handling associations between notes and versions
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 4c13d6c1fd0d98bd9d3f48f4623364ea60ded072 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4c13d6c1fd0d98bd9d3f48f4… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Apr 24 22:50:28 2011 +0200 TagNoteVersion: Add class for handling associations between notes and versions --- include/tag_Note.php | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/include/tag_Note.php b/include/tag_Note.php new file mode 100644 index 0000000..2644317 --- /dev/null +++ b/include/tag_Note.php @@ -0,0 +1,78 @@ +<?php + +require_once(BASE.'include/tag.php'); + +class TagNoteVersion extends Tag +{ + private $iAppId; + + function TagNoteVersion($iVersionId = null, $oRow = null, $sTextId = '') + { + if(!is_numeric($iVersionId) && !$oRow) + return; + + if(!$oRow) + { + $hResult = query_parameters("SELECT * FROM appVersion WHERE versionId = '?'", $iVersionId); + + if($hResult) + $oRow = mysql_fetch_object($hResult); + } + + if($oRow) + { + $this->bMultipleAssignments = true; + $this->iId = $oRow->versionId; + $this->sName = $oRow->versionName; + $this->sDescription = $oRow->description; + $this->iAppId = $oRow->appId; + $this->sTextId = $oRow->versionId; + $this->sState = $oRow->state; + } + } + + public function setAppId($iAppId) + { + if(is_numeric($iAppId) && $iAppId > 0) + $this->iAppId = $iAppId; + } + + protected function objectGetSQLTable() + { + return 'appVersion'; + } + + protected function getSQLTableForAssignments() + { + return 'tags_NoteVersion_assignments'; + } + + public function objectGetEntriesCount() + { + $hResult = query_parameters("SELECT COUNT(*) as count FROM ? WHERE appId = '?' AND state = 'accepted'", $this->objectGetSQLTable(), $this->iAppId); + + if(!$hResult) + return false; + + $oRow = mysql_fetch_object($hResult); + + return $oRow->count; + } + + public function objectGetEntries() + { + $hResult = query_parameters("SELECT * FROM ? WHERE appId = '?' AND state = 'accepted'", $this->objectGetSQLTable(), $this->iAppId); + + if(!$hResult) + return false; + + return $hResult; + } + + protected function getTagClass() + { + return 'Note'; + } +} + +?> \ No newline at end of file

1 0

Alexander Nicolaysen Sørnes : Tag: Make the class more extandable
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 49cb8686806957d42bae87f4d6c3fb72c0e4e5a4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=49cb8686806957d42bae87f4… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Apr 24 22:33:46 2011 +0200 Tag: Make the class more extandable --- include/tag.php | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/tag.php b/include/tag.php index 117234e..c9fac08 100644 --- a/include/tag.php +++ b/include/tag.php @@ -1,11 +1,13 @@ <?php +require_once(BASE.'include/objectManagerBase.php'); + abstract class Tag extends ObjectManagerBase { - private $bMultipleAssignments; - private $sTextId; - private $sName; - private $sDescription; + protected $bMultipleAssignments; + protected $sTextId; + protected $sName; + protected $sDescription; function Constructor($iId = null, $oRow = null, $sTextId = '') { @@ -158,7 +160,7 @@ abstract class Tag extends ObjectManagerBase public function objectGetEntriesCount() { - $hResult = query_parameters("SELECT COUNT(id) as count FROM ? WHERE state = 'accepted'", $this->objectGetSQLTable()); + $hResult = query_parameters("SELECT COUNT(*) as count FROM ? WHERE state = 'accepted'", $this->objectGetSQLTable()); if(!$hResult) return false; @@ -230,12 +232,11 @@ public function objectGetEntriesCount() return $shRet; } - public function getAssignTagsEditor($iAssignedFor = null) + public function getAssignTagsEditor($iAssignedFor = null, $aSelected = array()) { $shRet = ''; - $aSelected = array(); - if($iAssignedFor) + if(!sizeof($aSelected) && $iAssignedFor) $aSelected = $this->getAssignedTags($iAssignedFor); foreach($this->getTags() as $oTag)

1 0