December 2007 - Wine-Commits

Stefan Dösinger : wined3d: Some improvements for SFLAG_CONVERTED checking.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 37e872e9013cf875803cc04bd3dbad7da4c49bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e872e9013cf875803cc04bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 16 23:00:39 2007 +0100 wined3d: Some improvements for SFLAG_CONVERTED checking. We can check this flag before setting up the gl lock, and add the surface format to the FIXME. --- dlls/wined3d/surface.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 76b8a1d..e45dd4c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -47,6 +47,10 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { if(myDevice->createParms.BehaviorFlags & WINED3DCREATE_MULTITHREADED) { ActivateContext(myDevice, myDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); } + if(This->Flags & SFLAG_CONVERTED) { + FIXME("Read back converted textures unsupported, format=%s\n", debug_d3dformat(This->resource.format)); + return; + } ENTER_GL(); /* Make sure that a proper texture unit is selected, bind the texture @@ -86,12 +90,6 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { int src_pitch = 0; int dst_pitch = 0; - if(This->Flags & SFLAG_CONVERTED) { - FIXME("Read back converted textures unsupported\n"); - LEAVE_GL(); - return; - } - if (This->Flags & SFLAG_NONPOW2) { unsigned char alignment = This->resource.wineD3DDevice->surface_alignment; src_pitch = This->bytesPerPixel * This->pow2Width;

1 0

Stefan Dösinger : wined3d: Implement blits from the active render target to swapchains.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 7e9af243d197f608a814a5ea0b00c6862be2bc41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9af243d197f608a814a5ea0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 13:55:47 2007 +0100 wined3d: Implement blits from the active render target to swapchains. --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7971908..76b8a1d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2977,8 +2977,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * if(SrcSurface != myDevice->render_targets[0]) { ERR("Unexpected render target -> render target blit\n"); } - FIXME("Implement blit from active render target to a swapchain\n"); - return WINED3DERR_INVALIDCALL; + TRACE("Blit from active render target to a swapchain\n"); + /* Handled with regular texture -> swapchain blit */ } else if(srcSwapchain) { if(This != (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) { ERR("Unexpected render target -> render target blit\n"); @@ -2987,7 +2987,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * return WINED3DERR_INVALIDCALL; } - if(srcSwapchain || SrcSurface == myDevice->render_targets[0]) { + if((srcSwapchain || SrcSurface == myDevice->render_targets[0]) && !dstSwapchain) { /* Blit from render target to texture */ WINED3DRECT srect; BOOL upsideDown, stretchx;

1 0

Stefan Dösinger : wined3d: Emulate half float vertices if GL_NV_half_float is not there.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 7a1d35e513d75ec0f86b48418d8b4e6235e8dc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1d35e513d75ec0f86b48418… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 17 18:18:19 2007 +0100 wined3d: Emulate half float vertices if GL_NV_half_float is not there. --- dlls/wined3d/drawprim.c | 257 ++++++++++++++++++++++++++------------ dlls/wined3d/state.c | 6 + dlls/wined3d/vertexdeclaration.c | 3 + dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 185 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a1d35e513d75ec0f86b4…

1 0

Michael Stefaniuc : gdi32: There is no need to cast NULL to a function pointer.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 6b21feaec3e5b39608fa0bdd0bab9d0ab11737b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b21feaec3e5b39608fa0bdd0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 19 00:26:12 2007 +0100 gdi32: There is no need to cast NULL to a function pointer. --- dlls/gdi32/region.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 0fe94cb..b06727d 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1683,7 +1683,7 @@ static void REGION_RegionOp( top = max(r1->top,ybot); bot = min(r1->bottom,r2->top); - if ((top != bot) && (nonOverlap1Func != (void (*)())NULL)) + if ((top != bot) && (nonOverlap1Func != NULL)) { (* nonOverlap1Func) (newReg, r1, r1BandEnd, top, bot); } @@ -1695,7 +1695,7 @@ static void REGION_RegionOp( top = max(r2->top,ybot); bot = min(r2->bottom,r1->top); - if ((top != bot) && (nonOverlap2Func != (void (*)())NULL)) + if ((top != bot) && (nonOverlap2Func != NULL)) { (* nonOverlap2Func) (newReg, r2, r2BandEnd, top, bot); } @@ -1755,7 +1755,7 @@ static void REGION_RegionOp( curBand = newReg->numRects; if (r1 != r1End) { - if (nonOverlap1Func != (void (*)())NULL) + if (nonOverlap1Func != NULL) { do { @@ -1770,7 +1770,7 @@ static void REGION_RegionOp( } while (r1 != r1End); } } - else if ((r2 != r2End) && (nonOverlap2Func != (void (*)())NULL)) + else if ((r2 != r2End) && (nonOverlap2Func != NULL)) { do {

1 0

Michael Stefaniuc : secur32/tests: InitFunctionPtrs() needs to use the global crypt32dll variable.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 8537c46c93e87cdb82e2692513317e92573fc08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8537c46c93e87cdb82e269251… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 18 23:58:02 2007 +0100 secur32/tests: InitFunctionPtrs() needs to use the global crypt32dll variable. --- dlls/secur32/tests/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 3d3eb7f..dec9368 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -106,8 +106,8 @@ static const BYTE selfSignedCert[] = { static void InitFunctionPtrs(void) { HMODULE advapi32dll = GetModuleHandleA("advapi32.dll"); - HMODULE crypt32dll = LoadLibraryA("crypt32.dll"); + crypt32dll = LoadLibraryA("crypt32.dll"); secdll = LoadLibraryA("secur32.dll"); if(!secdll) secdll = LoadLibraryA("security.dll");

1 0

James Hawkins : msi: Free the ordering information.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: b774ffe1d21d3eaabc00ba6376bf91c937b573a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b774ffe1d21d3eaabc00ba637… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Dec 18 16:49:37 2007 -0600 msi: Free the ordering information. --- dlls/msi/table.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 7f6f8ef..844feb3 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1659,9 +1659,15 @@ static UINT TABLE_delete( struct tagMSIVIEW *view ) TRACE("%p\n", view ); tv->table = NULL; - tv->columns = NULL; + if (tv->order) + { + msi_free( tv->order->reorder ); + msi_free( tv->order ); + tv->order = NULL; + } + msi_free( tv ); return ERROR_SUCCESS;

1 0

Andrew Talbot : kernel32: Remove unneeded casts.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 650b273361a07949900baec5e6be2e01f4043e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=650b273361a07949900baec5e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 18 22:47:55 2007 +0000 kernel32: Remove unneeded casts. --- dlls/kernel32/local16.c | 4 ++-- dlls/kernel32/module.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c index 36bd774..5716281 100644 --- a/dlls/kernel32/local16.c +++ b/dlls/kernel32/local16.c @@ -133,7 +133,7 @@ typedef struct /* All local heap allocations are aligned on 4-byte boundaries */ #define LALIGN(word) (((word) + 3) & ~3) -#define ARENA_PTR(ptr,arena) ((LOCALARENA *)((char*)(ptr)+(arena))) +#define ARENA_PTR(ptr,arena) ((LOCALARENA *)((ptr)+(arena))) #define ARENA_PREV(ptr,arena) (ARENA_PTR((ptr),(arena))->prev & ~3) #define ARENA_NEXT(ptr,arena) (ARENA_PTR((ptr),(arena))->next) #define ARENA_FLAGS(ptr,arena) (ARENA_PTR((ptr),(arena))->prev & 3) @@ -1937,7 +1937,7 @@ static VOID Local32_FromHandle( LOCAL32HEADER *header, INT16 type, case 1: { WORD *selTable = (LPWORD)(header->base + header->selectorTableOffset); - DWORD offset = (LPBYTE)ptr - header->base; + DWORD offset = ptr - header->base; *addr = MAKELONG( offset & 0x7fff, selTable[offset >> 15] ); } break; diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 996abf3..47ca1ea 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -806,7 +806,7 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE* hmod) *hmod = 0; - if (SearchPathW( NULL, (LPCWSTR)name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]), + if (SearchPathW( NULL, name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]), filenameW, NULL )) { hFile = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ,

1 0

Alexander Nicolaysen Sørnes : Add initial un-delete support
by Chris Morgan Dec. 18, 2007

Dec. 18, 2007

Module: appdb Branch: master Commit: 8c7bd3a5e9229d4b89fc28069bb056d22b0622c8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8c7bd3a5e9229d4b89fc2806… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 22:43:22 2007 +0100 Add initial un-delete support --- include/appData.php | 7 +++- include/application.php | 59 ++++++++++++++++++++++------ include/application_queue.php | 23 ++++++++++- include/bugs.php | 7 +++- include/comment.php | 6 ++- include/distribution.php | 50 ++++++++++++++++++++--- include/downloadurl.php | 7 +++- include/maintainer.php | 7 +++- include/monitor.php | 7 +++- include/note.php | 6 ++- include/screenshot.php | 6 ++- include/testData.php | 30 ++++++++++++-- include/testData_queue.php | 19 ++++++++- include/url.php | 6 ++- include/vendor.php | 29 ++++++++++++- include/version.php | 72 +++++++++++++++++++++++++-------- include/version_queue.php | 20 ++++++++- include/vote.php | 5 ++ tables/appdb_tables.sql | 6 +- tables/distributions.sql | 2 +- tables/testResults.sql | 2 +- unit_test/test_appData.php | 2 +- unit_test/test_application.php | 6 +- unit_test/test_common.php | 4 +- unit_test/test_maintainer.php | 22 +++++----- unit_test/test_maintainer_notify.php | 2 +- unit_test/test_om_objects.php | 21 +++++----- unit_test/test_testData.php | 8 ++-- 28 files changed, 345 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=8c7bd3a5e9229d4b89fc…

1 0

Kirill K. Smirnov : kernel32: ReadConsoleW should wait for at least one character before returning.
by Alexandre Julliard Dec. 18, 2007

Dec. 18, 2007

Module: wine Branch: master Commit: c9700896fe666b17a203d82b65bfb71113977a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9700896fe666b17a203d82b6… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Tue Dec 18 19:38:50 2007 +0300 kernel32: ReadConsoleW should wait for at least one character before returning. --- dlls/kernel32/console.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 65312d2..6bbffac 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1359,17 +1359,20 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, /* FIXME: should we read at least 1 char? The SDK does not say */ /* wait for at least one available input record (it doesn't mean we'll have * chars stored in xbuf...) + * + * Although SDK doc keeps silence about 1 char, SDK examples assume + * that we should wait for at least one character (not key). --KS */ charsread = 0; do { if (read_console_input(hConsoleInput, &ir, timeout) != rci_gotone) break; - timeout = 0; if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown && ir.Event.KeyEvent.uChar.UnicodeChar && !(ir.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY)) { xbuf[charsread++] = ir.Event.KeyEvent.uChar.UnicodeChar; + timeout = 0; } } while (charsread < nNumberOfCharsToRead); /* nothing has been read */

1 0

Huw Davies : inetcomm: Unquote parameter values.
by Alexandre Julliard Dec. 18, 2007

Dec. 18, 2007

Module: wine Branch: master Commit: 979a43e49de5b69aa08a9ed9e72c235b784a8a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=979a43e49de5b69aa08a9ed9e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 18 15:37:21 2007 +0000 inetcomm: Unquote parameter values. --- dlls/inetcomm/mimeole.c | 35 ++++++++++++++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 27 +++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 38dd46b..6b5c75d 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -268,6 +268,39 @@ static void unfold_header(char *header, int len) *(start - 1) = '\0'; } +static char *unquote_string(const char *str) +{ + int quoted = 0; + char *ret, *cp; + + while(*str == ' ' || *str == '\t') str++; + + if(*str == '"') + { + quoted = 1; + str++; + } + ret = strdupA(str); + for(cp = ret; *cp; cp++) + { + if(*cp == '\\') + memmove(cp, cp + 1, strlen(cp + 1) + 1); + else if(*cp == '"') + { + if(!quoted) + { + WARN("quote in unquoted string\n"); + } + else + { + *cp = '\0'; + break; + } + } + } + return ret; +} + static void add_param(header_t *header, const char *p) { const char *key = p, *value, *cp = p; @@ -293,7 +326,7 @@ static void add_param(header_t *header, const char *p) param = HeapAlloc(GetProcessHeap(), 0, sizeof(*param)); param->name = name; - param->value = strdupA(value); + param->value = unquote_string(value); list_add_tail(&header->params, &param->entry); } diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index c36502e..f5cd619 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -36,7 +36,8 @@ static char msg1[] = "MIME-Version: 1.0\r\n" "Content-Type: multipart/mixed;\r\n" " boundary=\"------------1.5.0.6\";\r\n" - " stuff=\"du;nno\"\r\n" + " stuff=\"du;nno\";\r\n" + " morestuff=\"so\\\\me\\\"thing\\\"\"\r\n" "foo: bar\r\n" "From: Huw Davies <huw(a)codeweavers.com>\r\n" "From: Me <xxx(a)codeweavers.com>\r\n" @@ -90,7 +91,7 @@ static void test_CreateBody(void) LARGE_INTEGER off; ULARGE_INTEGER pos; ENCODINGTYPE enc; - ULONG count; + ULONG count, found_param, i; MIMEPARAMINFO *param_info; IMimeAllocator *alloc; @@ -119,7 +120,7 @@ static void test_CreateBody(void) ok(hr == S_OK, "ret %08x\n", hr); off.QuadPart = 0; IStream_Seek(in, off, STREAM_SEEK_CUR, &pos); - ok(pos.u.LowPart == 328, "pos %u\n", pos.u.LowPart); + ok(pos.u.LowPart == 359, "pos %u\n", pos.u.LowPart); hr = IMimeBody_IsContentType(body, "multipart", "mixed"); ok(hr == S_OK, "ret %08x\n", hr); @@ -153,9 +154,27 @@ static void test_CreateBody(void) hr = IMimeBody_GetParameters(body, "Content-Type", &count, &param_info); ok(hr == S_OK, "ret %08x\n", hr); todo_wine /* native adds a charset parameter */ - ok(count == 3, "got %d\n", count); + ok(count == 4, "got %d\n", count); ok(param_info != NULL, "got %p\n", param_info); + found_param = 0; + for(i = 0; i < count; i++) + { + if(!strcmp(param_info[i].pszName, "morestuff")) + { + found_param++; + ok(!strcmp(param_info[i].pszData, "so\\me\"thing\""), + "got %s\n", param_info[i].pszData); + } + else if(!strcmp(param_info[i].pszName, "stuff")) + { + found_param++; + ok(!strcmp(param_info[i].pszData, "du;nno"), + "got %s\n", param_info[i].pszData); + } + } + ok(found_param == 2, "matched %d params\n", found_param); + hr = IMimeAllocator_FreeParamInfoArray(alloc, count, param_info, TRUE); ok(hr == S_OK, "ret %08x\n", hr); IMimeAllocator_Release(alloc);

1 0