wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Alexandre Julliard : msvcrt: Don't define stubs for data exports.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 3a1086a659b47dfeba4f175c90efaceda2103d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1086a659b47dfeba4f175c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 16:06:32 2011 +0200 msvcrt: Don't define stubs for data exports. --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 727a496..e6b0365 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -411,7 +411,7 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __lconv +# extern __lconv @ cdecl __lconv_init() msvcrt.__lconv_init @ cdecl -arch=i386 __libm_sse2_acos() msvcrt.__libm_sse2_acos @ cdecl -arch=i386 __libm_sse2_acosf() msvcrt.__libm_sse2_acosf @@ -872,7 +872,7 @@ @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype @ stub _mbbtype_l -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ stub _mbccpy_l @ stub _mbccpy_s @@ -1326,7 +1326,7 @@ @ stub _wctime64_s @ stub _wctomb_l @ stub _wctomb_s_l -@ stub _wctype +# extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 69c0701..f728300 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -155,7 +155,7 @@ @ cdecl __isascii(long) msvcrt.__isascii @ cdecl __iscsym(long) msvcrt.__iscsym @ cdecl __iscsymf(long) msvcrt.__iscsymf -@ stub __lc_clike +# extern __lc_clike @ extern __lc_codepage msvcrt.__lc_codepage @ extern __lc_collate_cp msvcrt.__lc_collate_cp @ extern __lc_handle msvcrt.__lc_handle @@ -418,7 +418,7 @@ @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis @@ -610,7 +610,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ cdecl _wctime(ptr) msvcrt._wctime @ cdecl _wctime64(ptr) msvcrt._wctime64 -@ stub _wctype +# extern _wctype @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @ varargs _wexecle(wstr wstr) msvcrt._wexecle diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index ff1f77b..47a2c17 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -150,7 +150,7 @@ @ cdecl __isascii(long) msvcrt.__isascii @ cdecl __iscsym(long) msvcrt.__iscsym @ cdecl __iscsymf(long) msvcrt.__iscsymf -@ stub __lc_clike +# extern __lc_clike @ extern __lc_codepage msvcrt.__lc_codepage @ extern __lc_collate_cp msvcrt.__lc_collate_cp @ extern __lc_handle msvcrt.__lc_handle @@ -413,7 +413,7 @@ @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis @@ -606,7 +606,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ cdecl _wctime(ptr) msvcrt._wctime @ cdecl _wctime64(ptr) msvcrt._wctime64 -@ stub _wctype +# extern _wctype @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @ varargs _wexecle(wstr wstr) msvcrt._wexecle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 50960ca..3a3832c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -225,11 +225,11 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __lc_clike +# extern __lc_clike @ extern __lc_codepage msvcrt.__lc_codepage @ extern __lc_collate_cp msvcrt.__lc_collate_cp @ extern __lc_handle msvcrt.__lc_handle -@ stub __lconv +# extern __lconv @ cdecl __lconv_init() msvcrt.__lconv_init @ cdecl -arch=i386 __libm_sse2_acos() msvcrt.__libm_sse2_acos @ cdecl -arch=i386 __libm_sse2_acosf() msvcrt.__libm_sse2_acosf @@ -718,7 +718,7 @@ @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype @ stub _mbbtype_l -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ stub _mbccpy_l @ stub _mbccpy_s @@ -1179,7 +1179,7 @@ @ stub _wctime64_s @ stub _wctomb_l @ stub _wctomb_s_l -@ stub _wctype +# extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bfd3583..a37a128 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -222,11 +222,11 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __lc_clike +# extern __lc_clike @ extern __lc_codepage msvcrt.__lc_codepage @ extern __lc_collate_cp msvcrt.__lc_collate_cp @ extern __lc_handle msvcrt.__lc_handle -@ stub __lconv +# extern __lconv @ cdecl __lconv_init() msvcrt.__lconv_init @ cdecl -arch=i386 __libm_sse2_acos() msvcrt.__libm_sse2_acos @ cdecl -arch=i386 __libm_sse2_acosf() msvcrt.__libm_sse2_acosf @@ -706,7 +706,7 @@ @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype @ stub _mbbtype_l -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ stub _mbccpy_l @ stub _mbccpy_s @@ -1166,7 +1166,7 @@ @ stub _wctime64_s @ stub _wctomb_l @ stub _wctomb_s_l -@ stub _wctype +# extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 1531cd5..f598742 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -394,7 +394,7 @@ @ cdecl _malloc_dbg(long) msvcrt.malloc @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis

1 0

Piotr Caban : msvcrt: Added _swprintf and vsnprintf functions.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 67b5a868f1017a15fe709abc48f43e80f5ca7c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b5a868f1017a15fe709abc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 3 14:26:23 2011 +0200 msvcrt: Added _swprintf and vsnprintf functions. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b157d60..727a496 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1170,7 +1170,7 @@ @ stub _strupr_s_l @ stub _strxfrm_l @ cdecl _swab(str str long) msvcrt._swab -@ stub _swprintf +@ varargs _swprintf(ptr wstr) msvcrt._swprintf @ stub _swprintf_c @ stub _swprintf_c_l @ stub _swprintf_p diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 473883e..50960ca 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1024,7 +1024,7 @@ @ stub _strupr_s_l @ stub _strxfrm_l @ cdecl _swab(str str long) msvcrt._swab -@ stub _swprintf +@ varargs _swprintf(ptr wstr) msvcrt._swprintf @ stub _swprintf_c @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b7ffa1c..bfd3583 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1010,7 +1010,7 @@ @ stub _strupr_s_l @ stub _strxfrm_l @ cdecl _swab(str str long) msvcrt._swab -@ stub _swprintf +@ varargs _swprintf(ptr wstr) msvcrt._swprintf @ stub _swprintf_c @ stub _swprintf_c_l @ stub _swprintf_p diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4e6333f..7a05dd9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -960,7 +960,7 @@ # stub _strupr_s_l(str long ptr) # stub _strxfrm_l(ptr str long ptr) @ cdecl _swab(str str long) MSVCRT__swab -# stub _swprintf(ptr str) +@ varargs _swprintf(ptr wstr) MSVCRT_swprintf # stub _swprintf_c(ptr long str) # stub _swprintf_c_l(ptr long str ptr) @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @@ -1438,7 +1438,7 @@ @ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s @ cdecl vprintf(str ptr) MSVCRT_vprintf @ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s -# stub vsnprintf(ptr long str ptr) +@ cdecl vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf

1 0

Piotr Caban : msvcrt: Added _wtmpnam implementation.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 2a3484a22d6a2de286debb2b8934c28745a56f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a3484a22d6a2de286debb2b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 3 14:26:08 2011 +0200 msvcrt: Added _wtmpnam implementation. --- dlls/msvcrt/file.c | 64 ++++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c9ad136..84ec729 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -88,8 +88,10 @@ static int MSVCRT_stream_idx; /* INTERNAL: process umask */ static int MSVCRT_umask = 0; -/* INTERNAL: Static buffer for temp file name */ +/* INTERNAL: static data for tmpnam and _wtmpname functions */ +static int tmpnam_unique; static char MSVCRT_tmpname[MAX_PATH]; +static MSVCRT_wchar_t MSVCRT_wtmpname[MAX_PATH]; static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e'; static const unsigned int BAT = 'b' << 16 | 'a' << 8 | 't'; @@ -455,7 +457,7 @@ static void msvcrt_alloc_buffer(MSVCRT_FILE* file) } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ -static void msvcrt_int_to_base32(int num, char *str) +static int msvcrt_int_to_base32(int num, char *str) { char *p; int n = num; @@ -475,6 +477,33 @@ static void msvcrt_int_to_base32(int num, char *str) *p += ('a' - '0' - 10); num >>= 5; } + + return digits; +} + +/* INTERNAL: wide character version of msvcrt_int_to_base32 */ +static int msvcrt_int_to_base32_w(int num, MSVCRT_wchar_t *str) +{ + MSVCRT_wchar_t *p; + int n = num; + int digits = 0; + + while (n != 0) + { + n >>= 5; + digits++; + } + p = str + digits; + *p = 0; + while (--p >= str) + { + *p = (num & 31) + '0'; + if (*p > '9') + *p += ('a' - '0' - 10); + num >>= 5; + } + + return digits; } /********************************************************************* @@ -3336,18 +3365,17 @@ void CDECL MSVCRT_setbuf(MSVCRT_FILE* file, char *buf) */ char * CDECL MSVCRT_tmpnam(char *s) { - static int unique; char tmpstr[16]; char *p; - int count; + int count, size; if (s == 0) s = MSVCRT_tmpname; msvcrt_int_to_base32(GetCurrentProcessId(), tmpstr); p = s + sprintf(s, "\\s%s.", tmpstr); for (count = 0; count < MSVCRT_TMP_MAX; count++) { - msvcrt_int_to_base32(unique++, tmpstr); - strcpy(p, tmpstr); + size = msvcrt_int_to_base32(tmpnam_unique++, tmpstr); + memcpy(p, tmpstr, size); if (GetFileAttributesA(s) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND) break; @@ -3356,6 +3384,30 @@ char * CDECL MSVCRT_tmpnam(char *s) } /********************************************************************* + * _wtmpnam (MSVCRT.@) + */ +MSVCRT_wchar_t * MSVCRT_wtmpnam(MSVCRT_wchar_t *s) +{ + static const MSVCRT_wchar_t format[] = {'\\','s','%','s','.',0}; + MSVCRT_wchar_t tmpstr[16]; + MSVCRT_wchar_t *p; + int count, size; + if (s == 0) + s = MSVCRT_wtmpname; + msvcrt_int_to_base32_w(GetCurrentProcessId(), tmpstr); + p = s + MSVCRT__snwprintf(s, MAX_PATH, format, tmpstr); + for (count = 0; count < MSVCRT_TMP_MAX; count++) + { + size = msvcrt_int_to_base32_w(tmpnam_unique++, tmpstr); + memcpy(p, tmpstr, size*sizeof(MSVCRT_wchar_t)); + if (GetFileAttributesW(s) == INVALID_FILE_ATTRIBUTES && + GetLastError() == ERROR_FILE_NOT_FOUND) + break; + } + return s; +} + +/********************************************************************* * tmpfile (MSVCRT.@) */ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ca738d2..4e6333f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1192,7 +1192,7 @@ @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) # stub _wtempnam_dbg(wstr wstr long str long) -@ stub _wtmpnam(ptr) +@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam # stub _wtmpnam_s(ptr long) @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l

1 0

Huw Davies : gdi32/tests: Allow broken behaviour for nt4 sp1 and sp2.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 3a91df11e10d1b6b7fe8167ccbeece56430d3d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a91df11e10d1b6b7fe8167cc… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 3 12:14:32 2011 +0100 gdi32/tests: Allow broken behaviour for nt4 sp1 and sp2. --- dlls/gdi32/tests/dib.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 7bc48f3..57a2969 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -388,7 +388,9 @@ static void test_simple_graphics(void) ok(ds.dsBitfields[0] == 0, "got %08x\n", ds.dsBitfields[0]); ok(ds.dsBitfields[1] == 0, "got %08x\n", ds.dsBitfields[1]); ok(ds.dsBitfields[2] == 0, "got %08x\n", ds.dsBitfields[2]); - ok(ds.dsBmih.biCompression == BI_RGB, "got %x\n", ds.dsBmih.biCompression); + ok(ds.dsBmih.biCompression == BI_RGB || + broken(ds.dsBmih.biCompression == BI_BITFIELDS), /* nt4 sp1 and 2 */ + "got %x\n", ds.dsBmih.biCompression); orig_bm = SelectObject(mem_dc, dib);

1 0

Alexandre Julliard : tools: Add more spec files to synchronize automatically.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 6744fec6c7e444600bf7fc665df95500c34a56f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6744fec6c7e444600bf7fc665… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 11:13:08 2011 +0200 tools: Add more spec files to synchronize automatically. --- tools/make_specfiles | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 2ead737..73dd2bf 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -70,6 +70,38 @@ my @dll_groups = "d3dx9_25", "d3dx9_24", ], + [ + "d3dx10_43", + "d3dx10_42", + "d3dx10_41", + "d3dx10_40", + "d3dx10_39", + "d3dx10_38", + "d3dx10_37", + "d3dx10_36", + "d3dx10_35", + "d3dx10_34", + "d3dx10_33", + ], + [ + "d3dcompiler_43", + "d3dcompiler_42", + "d3dcompiler_41", + "d3dcompiler_40", + "d3dcompiler_39", + "d3dcompiler_38", + "d3dcompiler_37", + "d3dcompiler_36", + "d3dcompiler_35", + "d3dcompiler_34", + "d3dcompiler_33", + ], + [ + "xinput1_3", + "xinput1_2", + "xinput1_1", + "xinput9_1_0", + ], ); my $update_flags = 0;

1 0

Alexandre Julliard : d3dcompiler: Specify arguments for stub entry points that are used in forwards.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: cd2beae51b1db29e0d7659ac68f0c81cddd49c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2beae51b1db29e0d7659ac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:23:45 2011 +0200 d3dcompiler: Specify arguments for stub entry points that are used in forwards. --- dlls/d3dcompiler_43/d3dcompiler_43.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index d7e0305..6cbee43 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -4,8 +4,8 @@ @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders -@ stub D3DDisassemble10Effect -@ stub D3DDisassemble +@ stub D3DDisassemble10Effect(ptr long ptr) +@ stub D3DDisassemble(ptr long long ptr ptr) @ stdcall D3DGetBlobPart(ptr long long long ptr) @ stdcall D3DGetDebugInfo(ptr long ptr) @ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr)

1 0

Alexandre Julliard : d3dx10: Specify arguments for stub entry points.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 2565019d4a0370e559f8a164ab8859348541e50c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2565019d4a0370e559f8a164a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:23:00 2011 +0200 d3dx10: Specify arguments for stub entry points. --- dlls/d3dx10_37/d3dx10_37.spec | 2 +- dlls/d3dx10_39/d3dx10_39.spec | 6 +- dlls/d3dx10_43/d3dx10_43.spec | 134 ++++++++++++++++++++-------------------- 3 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2565019d4a0370e559f8a…

1 0

Alexandre Julliard : d3dx9: Synchronize entry point declarations across spec files.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 1ac7000a88358a5ae71145763e47ce0fc243b457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac7000a88358a5ae71145763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:22:43 2011 +0200 d3dx9: Synchronize entry point declarations across spec files. --- dlls/d3dx9_24/d3dx9_24.spec | 94 ++++++++++++++++++++-------------------- dlls/d3dx9_25/d3dx9_25.spec | 94 ++++++++++++++++++++-------------------- dlls/d3dx9_26/d3dx9_26.spec | 94 ++++++++++++++++++++-------------------- dlls/d3dx9_27/d3dx9_27.spec | 94 ++++++++++++++++++++-------------------- dlls/d3dx9_28/d3dx9_28.spec | 102 +++++++++++++++++++++--------------------- dlls/d3dx9_29/d3dx9_29.spec | 102 +++++++++++++++++++++--------------------- dlls/d3dx9_30/d3dx9_30.spec | 102 +++++++++++++++++++++--------------------- dlls/d3dx9_31/d3dx9_31.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_32/d3dx9_32.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_33/d3dx9_33.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_34/d3dx9_34.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_35/d3dx9_35.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_37/d3dx9_37.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_38/d3dx9_38.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_39/d3dx9_39.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_40/d3dx9_40.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_41/d3dx9_41.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_42/d3dx9_42.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_43/d3dx9_43.spec | 100 +++++++++++++++++++++--------------------- tools/make_specfiles | 22 +++++++++ 20 files changed, 963 insertions(+), 941 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ac7000a88358a5ae7114…

1 0

Alexandre Julliard : d3dx9_36: Specify arguments for stub entry points.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: f9c75812e49d4d9401950627496b864c733f26c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c75812e49d4d94019506274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:21:21 2011 +0200 d3dx9_36: Specify arguments for stub entry points. --- dlls/d3dx9_36/d3dx9_36.spec | 304 +++++++++++++++++++++--------------------- 1 files changed, 152 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c75812e49d4d9401950…

1 0

Huw Davies : shell32: Always clone the return pidl to avoid a double free if the selection is changed during teardown .
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: d6ce0b10c41b5c59f26c03891144af0338acf8cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ce0b10c41b5c59f26c03891… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 3 12:07:02 2011 +0100 shell32: Always clone the return pidl to avoid a double free if the selection is changed during teardown. --- dlls/shell32/brsfolder.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 3824c4e..b97a753 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -558,7 +558,8 @@ static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; - info->pidlRet = lptvid->lpifq; + ILFree(info->pidlRet); + info->pidlRet = ILClone(lptvid->lpifq); browsefolder_callback( info->lpBrowseInfo, info->hWnd, BFFM_SELCHANGED, (LPARAM)info->pidlRet ); BrsFolder_CheckValidSelection( info, lptvid ); @@ -676,8 +677,6 @@ static BOOL BrsFolder_OnCommand( browse_info *info, UINT id ) switch (id) { case IDOK: - /* The original pidl is owned by the treeview and will be free'd. */ - info->pidlRet = ILClone(info->pidlRet); if (info->pidlRet == NULL) /* A null pidl would mean a cancel */ info->pidlRet = _ILCreateDesktop(); pdump( info->pidlRet ); @@ -982,7 +981,10 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi) if (SUCCEEDED(hr)) OleUninitialize(); if (!r) + { + ILFree(info.pidlRet); return NULL; + } return info.pidlRet; }

1 0

← Newer
1
...
83
84
85
86
87
88
89
...
95
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 May 2011