wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

André Hentschel : advapi32/tests: Remove bad key set on cleanup.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 9374c5bb56de0855e9a8dae64be6fdce2b2209c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9374c5bb56de0855e9a8dae64… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 2 00:09:29 2013 +0200 advapi32/tests: Remove bad key set on cleanup. --- dlls/advapi32/tests/crypt.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 5f4d4e2..768dd3b 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -146,6 +146,13 @@ static void clean_up_environment(void) pCryptReleaseContext(hProv, 0); pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } + + /* Remove container "wine_test_bad_keyset" */ + if (pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } } static void test_acquire_context(void)

1 0

André Hentschel : wine.inf: Add winemac. drv to RelayFromExclude.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 7c0c050aa10e76ba26a4da7e39f48662505579b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0c050aa10e76ba26a4da7e3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 1 23:34:30 2013 +0200 wine.inf: Add winemac.drv to RelayFromExclude. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 84e40d2..89c6a75 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -492,7 +492,7 @@ HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" -HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;user32;gdi32;advapi32;kernel32" +HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;winemac.drv;user32;gdi32;advapi32;kernel32" [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904"

1 0

André Hentschel : dpnet: Increase reported buffer size .
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 9d6543b61279e06e90a4fffebf95e99646c1ba4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6543b61279e06e90a4fffeb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 1 16:21:53 2013 +0200 dpnet: Increase reported buffer size. --- dlls/dpnet/peer.c | 2 +- dlls/dpnet/tests/peer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index b3eb9cd..ef100a3 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -404,7 +404,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, co pdpspCaps->dwDefaultEnumTimeout = 1500; pdpspCaps->dwMaxEnumPayloadSize = 983; pdpspCaps->dwBuffersPerThread = 1; - pdpspCaps->dwSystemBufferSize = 8192; + pdpspCaps->dwSystemBufferSize = 0x10000; return DPN_OK; } diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index fc22f66..a9ab01d 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -140,7 +140,8 @@ static void test_get_sp_caps(void) ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); - ok(caps.dwSystemBufferSize == 8192, "expected 8192, got %d\n", caps.dwSystemBufferSize); + ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), + "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); } static void test_cleanup_dp(void)

1 0

Sergey Guralnik : extrac32: Get default path only when it is really necessary.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: da46ce10deeb8a327ad445ed86086dec33d16eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=da46ce10deeb8a327ad445ed8… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:27:44 2013 +0200 extrac32: Get default path only when it is really necessary. --- programs/extrac32/extrac32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 5216627..addd732 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -153,7 +153,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho /* Use extraction by default if names of required files presents */ cmd = i < argc ? 'E' : 'D'; - if (!path[0]) + if (cmd == 'E' && !path[0]) GetCurrentDirectoryW(MAX_PATH, path); lstrcatW(path, backslash);

1 0

Sergey Guralnik : extrac32: Extract by default when required files are specified.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 085c50683265b7482be2eb9b53d8367989ad3d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=085c50683265b7482be2eb9b5… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:22:41 2013 +0200 extrac32: Extract by default when required files are specified. --- programs/extrac32/extrac32.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index ade7456..5216627 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -149,6 +149,9 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho if (!GetFullPathNameW(argv[i], MAX_PATH, path, NULL)) return 0; } + else if (!cmd) + /* Use extraction by default if names of required files presents */ + cmd = i < argc ? 'E' : 'D'; if (!path[0]) GetCurrentDirectoryW(MAX_PATH, path); @@ -166,7 +169,6 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho /* Extract CAB archive */ extract(cabfile, path); break; - case 0: case 'D': /* Display CAB archive */ WINE_FIXME("/D not implemented\n");

1 0

Sergey Guralnik : extrac32: Allow leading '-' for command line switches.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 8c5deb56497494a66c8244bfdc40121d00103ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5deb56497494a66c8244bfd… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:12:47 2013 +0200 extrac32: Allow leading '-' for command line switches. --- programs/extrac32/extrac32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 11dd755..ade7456 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -105,7 +105,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho for(i = 0; i < argc; i++) { /* Get cabfile */ - if (argv[i][0] != '/') + if (argv[i][0] != '/' && argv[i][0] != '-') { if (!cabfile) {

1 0

Sergey Guralnik : extrac32: Merge identical case statements.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: a5ac00aaf422398a0bb6f47f815dd24eea10fc9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ac00aaf422398a0bb6f47f8… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:04:42 2013 +0200 extrac32: Merge identical case statements. --- programs/extrac32/extrac32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index fc1ae1c..11dd755 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -130,9 +130,6 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho return 0; break; case 'C': - if (cmd) return 0; - cmd = check; - break; case 'E': case 'D': if (cmd) return 0;

1 0

Stefan Leichter : msvcp110: Add VS2012 C/C++ runtime.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 56538fdf8983d999a91517b5ef4c0b7fe932f1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56538fdf8983d999a91517b5e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Mar 30 13:48:49 2013 +0100 msvcp110: Add VS2012 C/C++ runtime. --- configure | 1 + configure.ac | 1 + dlls/msvcp110/Makefile.in | 5 + dlls/msvcp110/msvcp110.c | 37 + dlls/msvcp110/msvcp110.spec | 3900 +++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 3945 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56538fdf8983d999a9151…

1 0

Stefan Leichter : msvcp: Match architecture with function we' re forwarding to.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: c19275302faf43e683c6f2918bd66e42a9d6e567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19275302faf43e683c6f2918… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Mar 30 13:48:33 2013 +0100 msvcp: Match architecture with function we're forwarding to. --- dlls/msvcp100/msvcp100.spec | 138 ++-- dlls/msvcp70/msvcp70.spec | 1408 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 1438 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 1438 +++++++++++++++++++++--------------------- 4 files changed, 2211 insertions(+), 2211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19275302faf43e683c6f…

1 0

Michael Stefaniuc : dplayx: Assimilate the rest of the inherited methods into IDirectPlay4.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 52d1aec827ad7aba6637d14b94e4fc75d005eb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d1aec827ad7aba6637d14b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:08:00 2013 +0100 dplayx: Assimilate the rest of the inherited methods into IDirectPlay4. --- dlls/dplayx/dplay.c | 150 +++++++++++++++++++++++---------------------------- 1 files changed, 68 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52d1aec827ad7aba6637d…

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
58
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 April 2013