wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Bruno Jesus : winejoystick.drv: Don' t assume the first joystick is at the first device on Linux.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 62876f3fc5feb1ca23d27a6de5adca580d963d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62876f3fc5feb1ca23d27a6de… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 15 19:01:48 2016 -0300 winejoystick.drv: Don't assume the first joystick is at the first device on Linux. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 35 ++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index b8fda4f..289e728 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -126,6 +126,7 @@ LRESULT driver_open(LPSTR str, DWORD dwIntf) return 0; JSTCK_Data[dwIntf].joyIntf = dwIntf; + JSTCK_Data[dwIntf].dev = -1; JSTCK_Data[dwIntf].in_use = TRUE; return (LRESULT)&JSTCK_Data[dwIntf]; } @@ -160,25 +161,43 @@ struct js_status */ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) { - char buf[20]; - int flags; + char buf[20]; + int flags, fd, found_ix, i; if (jstick->dev > 0) return jstick->dev; - sprintf(buf, JOYDEV_NEW, jstick->joyIntf); #ifdef HAVE_LINUX_22_JOYSTICK_API flags = O_RDONLY | O_NONBLOCK; #else flags = O_RDONLY; #endif - if ((jstick->dev = open(buf, flags)) < 0) { - sprintf(buf, JOYDEV_OLD, jstick->joyIntf); - if ((jstick->dev = open(buf, flags)) < 0) - return jstick->dev; + + /* The first joystick may not be at /dev/input/js0, find the correct + * first or second device. For example the driver for XBOX 360 wireless + * receiver creates entries starting at 20. + */ + for (found_ix = i = 0; i < MAXJOYSTICK; i++) { + sprintf(buf, JOYDEV_NEW, i); + if ((fd = open(buf, flags)) < 0) { + sprintf(buf, JOYDEV_OLD, i); + if ((fd = open(buf, flags)) < 0) + continue; + } + + if (found_ix++ == jstick->joyIntf) + { + TRACE("Found joystick[%d] at %s\n", jstick->joyIntf, buf); + jstick->dev = fd; + break; + } + + close(fd); } + #ifdef HAVE_LINUX_22_JOYSTICK_API - ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap); + if (jstick->dev > 0) + ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap); #endif return jstick->dev; }

1 0

Vincent Povirk : gdiplus/tests: Add test for containers in metafiles.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 977ba49768f355582af47e2fa3bb2279525b1677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=977ba49768f355582af47e2fa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 15 16:25:42 2016 -0500 gdiplus/tests: Add test for containers in metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 161 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index c2cc400..a9d54a7 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1709,6 +1709,166 @@ static void test_frameunit(void) expect(Ok, stat); } +static const emfplus_record container_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeEndContainer}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSave}, + {0, EmfPlusRecordTypeRestore}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeEndContainer}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_containers(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + GpBitmap *bitmap; + GpBrush *brush; + ARGB color; + HDC hdc; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GraphicsContainer state1, state2; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + /* Normal usage */ + stat = GdipBeginContainer2(graphics, &state1); + expect(Ok, stat); + + stat = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff000000, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 5.0, 5.0, 5.0, 5.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + + stat = GdipScaleWorldTransform(graphics, 1.0, 1.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 5.0, 5.0, 5.0, 5.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipSaveGraphics(graphics, &state1); + expect(Ok, stat); + + stat = GdipRestoreGraphics(graphics, state1); + expect(Ok, stat); + + /* Popping two states at once */ + stat = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipBeginContainer2(graphics, &state1); + expect(Ok, stat); + + stat = GdipScaleWorldTransform(graphics, 4.0, 4.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipBeginContainer2(graphics, &state2); + expect(Ok, stat); + + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff00ff00, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 20.0, 20.0, 5.0, 5.0); + expect(Ok, stat); + + /* Restoring an invalid state seems to break the graphics object? */ + if (0) { + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + } + + /* Ending metafile with a state open */ + stat = GdipBeginContainer2(graphics, &state1); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, container_records, "container metafile", dst_points, &frame, UnitPixel); + + sync_metafile(&metafile, "container.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, container_records, "container playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 80, 80, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 12, 12, &color); + expect(Ok, stat); + expect(0xff000000, color); + + stat = GdipBitmapGetPixel(bitmap, 8, 8, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 42, 42, &color); + expect(Ok, stat); + expect(0xff00ff00, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1743,6 +1903,7 @@ START_TEST(metafile) test_worldtransform(); test_converttoemfplus(); test_frameunit(); + test_containers(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Add support for containers in metafiles.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: f28803c0a4b34ad4a46fcb1700076c17633c4fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28803c0a4b34ad4a46fcb170… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 15 16:25:41 2016 -0500 gdiplus: Add support for containers in metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 5 + dlls/gdiplus/graphics.c | 14 +++ dlls/gdiplus/image.c | 1 + dlls/gdiplus/metafile.c | 205 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 225 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f28803c0a4b34ad4a46fc…

1 0

Peter Beutner : kernel32: Properly handle double delimiters in GetShortPathName/GetLongPathName.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: c90e46b66ded518dbfb88f1efdc366e7986defb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90e46b66ded518dbfb88f1ef… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Sun Aug 14 22:04:50 2016 +0200 kernel32: Properly handle double delimiters in GetShortPathName/GetLongPathName. Signed-off-by: Peter Beutner <p.beutner(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 27 ++------------------------- dlls/kernel32/tests/path.c | 10 ---------- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 620401d..eadd2e7 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -335,23 +335,12 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen /* check for path delimiters and reproduce them */ if (shortpath[sp] == '\\' || shortpath[sp] == '/') { - if (!lp || (tmplongpath[lp-1] != '\\' && tmplongpath[lp-1] != '/')) - { - /* strip double delimiters */ - tmplongpath[lp++] = shortpath[sp]; - } + tmplongpath[lp++] = shortpath[sp++]; tmplongpath[lp] = 0; /* terminate string */ - sp++; continue; } p = shortpath + sp; - if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) - { - tmplongpath[lp++] = *p++; - tmplongpath[lp++] = *p++; - sp += 2; - } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (shortpath + sp); lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); @@ -498,24 +487,12 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* check for path delimiters and reproduce them */ if (longpath[lp] == '\\' || longpath[lp] == '/') { - if (!sp || (tmpshortpath[sp-1] != '\\' && tmpshortpath[sp-1] != '/')) - { - /* strip double delimiters */ - tmpshortpath[sp] = longpath[lp]; - sp++; - } + tmpshortpath[sp++] = longpath[lp++]; tmpshortpath[sp] = 0; /* terminate string */ - lp++; continue; } p = longpath + lp; - if (lp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) - { - tmpshortpath[sp++] = *p++; - tmpshortpath[sp++] = *p++; - lp += 2; - } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (longpath + lp); lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 764141d..7eb9e75 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -949,31 +949,23 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) /* test double delimiters */ sprintf(tmpstr,"%s\\\\%s", SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,".\\\\%s\\\\%s", SHORTDIR,SHORTFILE); - todo_wine - { ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } if (pGetLongPathNameA) { sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); - todo_wine - { ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } } } @@ -2204,12 +2196,10 @@ static void test_relative_path(void) strcpy(buf, "deadbeef"); ret = pGetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); - todo_wine ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..\\\\foo\\file", buf, MAX_PATH); ok(ret, "GetShortPathName error %d\n", GetLastError()); - todo_wine ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); SetCurrentDirectoryA("..");

1 0

Peter Beutner : kernel32/tests: Add path tests for double delimiters.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 1fe0b84ffc26fab222195b4a451cfda0ff0e9555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe0b84ffc26fab222195b4a4… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Sun Aug 14 22:04:49 2016 +0200 kernel32/tests: Add path tests for double delimiters. Signed-off-by: Peter Beutner <p.beutner(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 6520513..764141d 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -945,6 +945,36 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) test_ShortPathCase(curdir,SHORTDIR,LONGFILE); test_ShortPathCase(curdir,LONGDIR,SHORTFILE); test_ShortPathCase(curdir,LONGDIR,LONGFILE); + + /* test double delimiters */ + sprintf(tmpstr,"%s\\\\%s", SHORTDIR,SHORTFILE); + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,".\\\\%s\\\\%s", SHORTDIR,SHORTFILE); + todo_wine + { + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } + + if (pGetLongPathNameA) { + sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); + ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + + sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); + todo_wine + { + ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } + } } static void test_GetTempPathA(char* tmp_dir) @@ -2170,6 +2200,18 @@ static void test_relative_path(void) ok(ret, "GetShortPathName error %d\n", GetLastError()); ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); + /* test double delimiters */ + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ok(ret, "GetLongPathName error %d\n", GetLastError()); + todo_wine + ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); + todo_wine + ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); + SetCurrentDirectoryA(".."); DeleteFileA("foo\\file"); RemoveDirectoryA("foo");

1 0

Andrew Eikum : Revert "dsound: Allow inactive devices to change the primary format.".
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: b25e1aefc7b868266042f842955a001618ef3b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25e1aefc7b868266042f8429… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 15 09:02:36 2016 -0500 Revert "dsound: Allow inactive devices to change the primary format.". This reverts commit 4fbe6f3e7601f7b39f7f672ffe43553eee92ab1b. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 830764a..f9720f8 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -478,30 +478,35 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); - old_fmt = device->primary_pwfx; - device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); - fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; - if (device->primary_pwfx == NULL) { - err = DSERR_OUTOFMEMORY; - goto out; - } + if (device->priolevel == DSSCL_WRITEPRIMARY) { + old_fmt = device->primary_pwfx; + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); + fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; + if (device->primary_pwfx == NULL) { + err = DSERR_OUTOFMEMORY; + goto out; + } - if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->Samples.wValidBitsPerSample == 0) { - TRACE("Correcting 0 valid bits per sample\n"); - fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; - } + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->Samples.wValidBitsPerSample == 0) { + TRACE("Correcting 0 valid bits per sample\n"); + fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; + } - if(device->priolevel == DSSCL_WRITEPRIMARY || device->nrofbuffers == 0) err = DSOUND_ReopenDevice(device, TRUE); - if (FAILED(err) && device->priolevel == DSSCL_WRITEPRIMARY) { - ERR("No formats could be opened\n"); - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = old_fmt; + if (FAILED(err)) { + ERR("No formats could be opened\n"); + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = old_fmt; + } else + HeapFree(GetProcessHeap(), 0, old_fmt); } else { - /* ignore failures */ - err = S_OK; - HeapFree(GetProcessHeap(), 0, old_fmt); + WAVEFORMATEX *wfx = DSOUND_CopyFormat(passed_fmt); + if (wfx) { + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = wfx; + } else + err = DSERR_OUTOFMEMORY; } out:

1 0

Hugh McMaster : reg/tests: Add more Unicode tests for 'reg import'.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 5df297206debc1256bfa479488e1941fce108cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df297206debc1256bfa47948… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 15 09:19:24 2016 +0000 reg/tests: Add more Unicode tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index a275db9..bd25a94 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -913,6 +913,45 @@ static void test_import(void) todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); /* Test file contents - Unicode */ + test_import_wstr("REGEDIT\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("REGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode1\"=\"Value1\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode1", REG_SZ, "Value1", 7, 0); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode2\"=\"Value2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode2", REG_SZ, "Value2", 7, 0); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode3\"=\"Value3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode3", REG_SZ, "Value3", 7, 0); + test_import_wstr("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -953,6 +992,30 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbf\nWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode4\"=\"Value4\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode4", REG_SZ, "Value4", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode5\"=\"Value5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode5", REG_SZ, "Value5", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode6\"=\"Value6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode6", REG_SZ, "Value6", 7, 0); + + err = RegCloseKey(hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); } START_TEST(reg)

1 0

Hugh McMaster : reg/tests: Add more tests for 'reg import'.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 596ca595d87c2bcb3fe0f7f67f822d3af141b2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=596ca595d87c2bcb3fe0f7f67… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 15 09:19:13 2016 +0000 reg/tests: Add more tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index fb5edbc..a275db9 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -856,6 +856,31 @@ static void test_import(void) test_import_str("REGEDIT4 FOO\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value1\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test2", REG_SZ, "Value2", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test3", REG_SZ, "Value3", 7, 0); + test_import_str("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -863,6 +888,30 @@ static void test_import(void) test_import_str("Windows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_str("Windows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value4\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test4", REG_SZ, "Value4", 7, 0); + + test_import_str("Windows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test5", REG_SZ, "Value5", 7, 0); + + test_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test6", REG_SZ, "Value6", 7, 0); + + err = RegCloseKey(hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + /* Test file contents - Unicode */ test_import_wstr("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */,

1 0

Benjamin Hodgetts : wined3d: Add Nvidia 1XXX range to detection list.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 9dff8b75e6ed4da1780e324951256e2593b4c8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dff8b75e6ed4da1780e32495… Author: Benjamin Hodgetts <ben(a)xnode.org> Date: Thu Aug 11 22:58:03 2016 +0100 wined3d: Add Nvidia 1XXX range to detection list. Signed-off-by: Benjamin Hodgetts <ben(a)xnode.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9da237d..50fb50d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1312,6 +1312,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1767,6 +1770,9 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ + {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ + {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7883951..fc8c397 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1953,6 +1953,9 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, + CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, + CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, + CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Nikolay Sivov : msvcirt/tests: Fix indentation warnings on GCC 6.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 67d7690e5303e7d9b1f2ee78a63022cd721210a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d7690e5303e7d9b1f2ee78a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 10:14:50 2016 +0300 msvcirt/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 84 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67d7690e5303e7d9b1f2e…

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016