December 2011 - Wine-Commits

Hans Leidekker : msi/tests: Try harder to remove a shortcut file.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 75242afefd21935a2923a24faf1ca2719a27376b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75242afefd21935a2923a24fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 6 13:13:33 2011 +0100 msi/tests: Try harder to remove a shortcut file. --- dlls/msi/tests/install.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 7c74e66..8e4e4b7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5335,19 +5335,19 @@ static void test_shortcut(void) CoUninitialize(); - delete_pf("msitest\\cabout\\new\\five.txt", TRUE); - delete_pf("msitest\\cabout\\new", FALSE); - delete_pf("msitest\\cabout\\four.txt", TRUE); - delete_pf("msitest\\cabout", FALSE); - delete_pf("msitest\\changed\\three.txt", TRUE); - delete_pf("msitest\\changed", FALSE); - delete_pf("msitest\\first\\two.txt", TRUE); - delete_pf("msitest\\first", FALSE); - delete_pf("msitest\\filename", TRUE); - delete_pf("msitest\\one.txt", TRUE); - delete_pf("msitest\\service.exe", TRUE); - delete_pf("msitest\\Shortcut.lnk", TRUE); - delete_pf("msitest", FALSE); + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + while (!delete_pf("msitest\\Shortcut.lnk", TRUE) && GetLastError() == ERROR_SHARING_VIOLATION) Sleep(1000); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: delete_test_files();

1 0

Aric Stewart : usp10: The top logclust value may be different than the number of chars.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 4dffb0aa430bb240b6bc337a139dd6dafd69a139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dffb0aa430bb240b6bc337a1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 08:48:20 2011 -0600 usp10: The top logclust value may be different than the number of chars. --- dlls/usp10/shape.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8706fad..8837213 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1359,6 +1359,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch int target_index = -1; int replacing_glyph = -1; int changed = 0; + int top_logclust = 0; if (changeCount > 0) { @@ -1369,6 +1370,9 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch } seeking_glyph = target_glyph; + for (i = 0; i < chars; i++) + if (pwLogClust[i] > top_logclust) + top_logclust = pwLogClust[i]; do { if (write_dir > 0) @@ -1392,7 +1396,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch if (target_index == -1) seeking_glyph ++; } - while (target_index == -1 && seeking_glyph < chars); + while (target_index == -1 && seeking_glyph <= top_logclust); if (target_index == -1) {

1 0

Piotr Caban : msvcp90: Added _Locinfo constructor implementation.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: e97578e4071831dcc2380802c1aae2dac2ff8a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97578e4071831dcc2380802c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:48:46 2011 +0100 msvcp90: Added _Locinfo constructor implementation. --- dlls/msvcp90/locale.c | 84 ++++++++++++++++++++++++++++++----------------- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcp90/string.c | 4 +- 3 files changed, 56 insertions(+), 34 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index e928d3e..2614724 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -712,29 +712,35 @@ void* __thiscall _Timevec__Getptr(_Timevec *this) return this->timeptr; } -/* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ -/* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPEAV12(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ -_Locinfo* __cdecl _Locinfo__Locinfo_ctor_bstr(_Locinfo *locinfo, const basic_string_char *locstr) -{ - FIXME("(%p %p) stub\n", locinfo, locstr); - return NULL; -} - -/* ??0_Locinfo(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ -/* ??0_Locinfo(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ -DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_bstr, 8) -_Locinfo* __thiscall _Locinfo_ctor_bstr(_Locinfo *this, const basic_string_char *locstr) -{ - FIXME("(%p %p) stub\n", this, locstr); - return NULL; -} - /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)HPBD@Z */ /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPEAV12(a)HPEBD@Z */ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int category, const char *locstr) { - FIXME("(%p %d %s) stub\n", locinfo, category, locstr); - return NULL; + const char *locale = NULL; + + /* This function is probably modifying more global objects */ + FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + + if(!locstr) + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + + _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); + MSVCP_basic_string_char_ctor_cstr(&locinfo->days, ""); + MSVCP_basic_string_char_ctor_cstr(&locinfo->months, ""); + MSVCP_basic_string_char_ctor_cstr(&locinfo->oldlocname, setlocale(LC_ALL, NULL)); + + if(category) + locale = setlocale(LC_ALL, locstr); + else + locale = setlocale(LC_ALL, NULL); + + if(locale) + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); + else + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); + _Lockit_dtor(&locinfo->lock); + + return locinfo; } /* ??0_Locinfo(a)std@@QAE(a)HPBD@Z */ @@ -742,16 +748,29 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_cat_cstr, 12) _Locinfo* __thiscall _Locinfo_ctor_cat_cstr(_Locinfo *this, int category, const char *locstr) { - FIXME("(%p %d %s) stub\n", this, category, locstr); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(this, category, locstr); +} + +/* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ +/* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPEAV12(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ +_Locinfo* __cdecl _Locinfo__Locinfo_ctor_bstr(_Locinfo *locinfo, const basic_string_char *locstr) +{ + return _Locinfo__Locinfo_ctor_cat_cstr(locinfo, 1/*FIXME*/, MSVCP_basic_string_char_c_str(locstr)); +} + +/* ??0_Locinfo(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ +/* ??0_Locinfo(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ +DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_bstr, 8) +_Locinfo* __thiscall _Locinfo_ctor_bstr(_Locinfo *this, const basic_string_char *locstr) +{ + return _Locinfo__Locinfo_ctor_cat_cstr(this, 1/*FIXME*/, MSVCP_basic_string_char_c_str(locstr)); } /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)PBD@Z */ /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPEAV12(a)PEBD@Z */ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cstr(_Locinfo *locinfo, const char *locstr) { - FIXME("(%p %s) stub\n", locinfo, locstr); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(locinfo, 1/*FIXME*/, locstr); } /* ??0_Locinfo(a)std@@QAE(a)PBD@Z */ @@ -759,16 +778,20 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cstr(_Locinfo *locinfo, const char *loc DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_cstr, 8) _Locinfo* __thiscall _Locinfo_ctor_cstr(_Locinfo *this, const char *locstr) { - FIXME("(%p %s) stub\n", this, locstr); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(this, 1/*FIXME*/, locstr); } /* ?_Locinfo_dtor(a)_Locinfo@std@@SAXPAV12@@Z */ /* ?_Locinfo_dtor(a)_Locinfo@std@@SAXPEAV12@@Z */ -_Locinfo* __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) +void __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) { - FIXME("(%p) stub\n", locinfo); - return NULL; + TRACE("(%p)\n", locinfo); + + setlocale(LC_ALL, MSVCP_basic_string_char_c_str(&locinfo->oldlocname)); + MSVCP_basic_string_char_dtor(&locinfo->days); + MSVCP_basic_string_char_dtor(&locinfo->months); + MSVCP_basic_string_char_dtor(&locinfo->oldlocname); + MSVCP_basic_string_char_dtor(&locinfo->newlocname); } /* ??_F_Locinfo(a)std@@QAEXXZ */ @@ -776,8 +799,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) DEFINE_THISCALL_WRAPPER(_Locinfo_ctor, 4) _Locinfo* __thiscall _Locinfo_ctor(_Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(this, 1/*FIXME*/, "C"); } /* ??1_Locinfo(a)std@@QAE(a)XZ */ @@ -785,7 +807,7 @@ _Locinfo* __thiscall _Locinfo_ctor(_Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo_dtor, 4) void __thiscall _Locinfo_dtor(_Locinfo *this) { - FIXME("(%p) stub\n", this); + _Locinfo__Locinfo_dtor(this); } /* ?_Locinfo_Addcats(a)_Locinfo@std@@SAAAV12(a)PAV12@HPBD(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 72e5d11..ed66d23 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -172,7 +172,7 @@ typedef struct _basic_string_char basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); -const char* __stdcall MSVCP_basic_string_char_c_str(basic_string_char*); +const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); #define BUF_SIZE_WCHAR 8 typedef struct _basic_string_wchar diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 19459c1..906a99c 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -882,7 +882,7 @@ MSVCP_size_t __thiscall basic_string_char_copy(const basic_string_char *this, /* ?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ /* ?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_c_str, 4) -const char* __thiscall MSVCP_basic_string_char_c_str(basic_string_char *this) +const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char *this) { TRACE("%p\n", this); return basic_string_char_const_ptr(this); @@ -2724,7 +2724,7 @@ MSVCP_size_t __thiscall basic_string_wchar_copy(const basic_string_wchar *this, /* ?data@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEPBGXZ */ /* ?data@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAPEBGXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_c_str, 4) -const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(basic_string_wchar *this) +const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar *this) { TRACE("%p\n", this); return basic_string_wchar_const_ptr(this);

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Addcats partial implementation.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: bff3f0cd3c75253c6163e6e698026c7948d94e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff3f0cd3c75253c6163e6e69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:49:01 2011 +0100 msvcp90: Added _Locinfo::_Addcats partial implementation. --- dlls/msvcp90/locale.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2614724..0cc0c58 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -814,8 +814,28 @@ void __thiscall _Locinfo_dtor(_Locinfo *this) /* ?_Locinfo_Addcats(a)_Locinfo@std@@SAAEAV12(a)PEAV12@HPEBD(a)Z */ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, const char *locstr) { - FIXME("%p %d %s) stub\n", locinfo, category, locstr); - return NULL; + const char *locale = NULL; + + /* This function is probably modifying more global objects */ + FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + if(!locstr) + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + + _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); + MSVCP_basic_string_char_dtor(&locinfo->newlocname); + + if(category) + locale = setlocale(LC_ALL, locstr); + else + locale = setlocale(LC_ALL, NULL); + + if(locale) + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); + else + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); + _Lockit_dtor(&locinfo->lock); + + return locinfo; } /* ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z */ @@ -823,8 +843,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con DEFINE_THISCALL_WRAPPER(_Locinfo__Addcats, 12) _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char *locstr) { - FIXME("(%p %d %s) stub\n", this, category, locstr); - return NULL; + return _Locinfo__Locinfo_Addcats(this, category, locstr); } /* ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ */

1 0

Piotr Caban : msvcrt: Fix lc_collate_cp initialization.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: dbff7a1ca2872cc305133d400891ff99b845b8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbff7a1ca2872cc305133d400… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:48:09 2011 +0100 msvcrt: Fix lc_collate_cp initialization. --- dlls/msvcrt/locale.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6bb6162..6893685 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -789,6 +789,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) MSVCRT__free_locale(loc); return NULL; } + + loc->locinfo->lc_collate_cp = loc->locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage; } else loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = MSVCRT__strdup("C"); @@ -802,7 +804,6 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } loc->locinfo->lc_codepage = loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage; - loc->locinfo->lc_collate_cp = loc->locinfo->lc_codepage; loc->locinfo->lc_clike = 1; if(!GetCPInfo(loc->locinfo->lc_codepage, &cp)) { MSVCRT__free_locale(loc); @@ -1155,6 +1156,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) switch(category) { case MSVCRT_LC_ALL: case MSVCRT_LC_COLLATE: + locinfo->lc_collate_cp = loc->locinfo->lc_collate_cp; locinfo->lc_handle[MSVCRT_LC_COLLATE] = loc->locinfo->lc_handle[MSVCRT_LC_COLLATE]; swap_pointers((void**)&locinfo->lc_category[MSVCRT_LC_COLLATE].locale, @@ -1174,7 +1176,6 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) (void**)&loc->locinfo->lc_category[MSVCRT_LC_CTYPE].refcount); locinfo->lc_codepage = loc->locinfo->lc_codepage; - locinfo->lc_collate_cp = loc->locinfo->lc_collate_cp; locinfo->lc_clike = loc->locinfo->lc_clike; locinfo->mb_cur_max = loc->locinfo->mb_cur_max;

1 0

Piotr Caban : msvcrt: Added _get_current_locale implementation.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: f84858ac2c2e31bfa0bf90af4b1f7f4df20491b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84858ac2c2e31bfa0bf90af4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:47:54 2011 +0100 msvcrt: Added _get_current_locale implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 24 ++++++++++++++++++++++-- dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1760a1a..38ec0e1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -675,7 +675,7 @@ @ varargs _fwscanf_s_l(ptr wstr ptr) msvcrt._fwscanf_s_l @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s -@ stub _get_current_locale +@ cdecl _get_current_locale() msvcrt._get_current_locale @ stub _get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 503864f..a083053 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -517,7 +517,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz -@ stub _get_current_locale +@ cdecl _get_current_locale() msvcrt._get_current_locale @ stub _get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7976a0f..475e3a9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -512,7 +512,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz -@ stub _get_current_locale +@ cdecl _get_current_locale() msvcrt._get_current_locale @ stub _get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 44fdf7c..6bb6162 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -603,6 +603,9 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) if(!locinfo) return; + if(InterlockedDecrement(&locinfo->refcount)) + return; + for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) { MSVCRT_free(locinfo->lc_category[i].locale); MSVCRT_free(locinfo->lc_category[i].refcount); @@ -640,9 +643,26 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) if(!mbcinfo) return; + if(InterlockedDecrement(&mbcinfo->refcount)) + return; + MSVCRT_free(mbcinfo); } +/* _get_current_locale - not exported in native msvcrt */ +MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) +{ + MSVCRT__locale_t loc = MSVCRT_malloc(sizeof(MSVCRT__locale_tstruct)); + if(!loc) + return NULL; + + loc->locinfo = get_locinfo(); + loc->mbcinfo = get_mbcinfo(); + InterlockedIncrement(&loc->locinfo->refcount); + InterlockedIncrement(&loc->mbcinfo->refcount); + return loc; +} + /* _free_locale - not exported in native msvcrt */ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) { @@ -747,6 +767,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } memset(loc->locinfo, 0, sizeof(MSVCRT_threadlocinfo)); + loc->locinfo->refcount = 1; + loc->mbcinfo->refcount = 1; loc->locinfo->lconv = MSVCRT_malloc(sizeof(struct MSVCRT_lconv)); if(!loc->locinfo->lconv) { @@ -762,8 +784,6 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) return NULL; } - loc->locinfo->refcount = 1; - if(lcid[MSVCRT_LC_COLLATE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_COLLATE)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_COLLATE], loc, MSVCRT_LC_COLLATE)) { MSVCRT__free_locale(loc); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dfd3a07..75a3b35 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1490,6 +1490,7 @@ @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl _configthreadlocale(long) @ cdecl _create_locale(long str) MSVCRT__create_locale +@ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _dupenv_s(ptr ptr str) @ cdecl _free_locale(ptr) MSVCRT__free_locale @ cdecl _get_invalid_parameter_handler()

1 0

Alexandre Julliard : gdi32: Add a helper function to clip a rectangle to the DC visible rect.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 1e2dd7cad83a5e1de5fbb71709e9a69510f4a83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2dd7cad83a5e1de5fbb7170… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 12:57:30 2011 +0100 gdi32: Add a helper function to clip a rectangle to the DC visible rect. --- dlls/gdi32/bitblt.c | 12 +++--------- dlls/gdi32/clipping.c | 19 ++++++++++++++++++- dlls/gdi32/dib.c | 18 +++++++----------- dlls/gdi32/font.c | 4 +--- dlls/gdi32/gdi_private.h | 2 +- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a7c4918..bfb56a6 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -104,7 +104,7 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, DC *dc_src, struct bitblt_coords *src ) { - RECT rect, clip; + RECT rect; /* get the destination visible rectangle */ @@ -124,10 +124,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, } get_bounding_rect( &rect, dst->x, dst->y, dst->width, dst->height ); - if (get_clip_box( dc_dst, &clip )) - intersect_rect( &dst->visrect, &rect, &clip ); - else - dst->visrect = rect; + clip_visrect( dc_dst, &dst->visrect, &rect ); /* get the source visible rectangle */ @@ -408,7 +405,6 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, struct gdi_image_bits bits; unsigned int i; POINT *pts; - RECT clip; BOOL ret = TRUE; DWORD err; HRGN rgn; @@ -437,9 +433,7 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, dst.y = dst.visrect.top; dst.width = dst.visrect.right - dst.visrect.left; dst.height = dst.visrect.bottom - dst.visrect.top; - - if (get_clip_box( dc, &clip )) intersect_rect( &dst.visrect, &dst.visrect, &clip ); - if (is_rect_empty( &dst.visrect )) goto done; + if (!clip_visrect( dc, &dst.visrect, &dst.visrect )) goto done; /* query the bitmap format */ info->bmiHeader.biSize = sizeof(info->bmiHeader); diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 70e0e32..53ad56b 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -57,7 +57,7 @@ static inline RECT get_clip_rect( DC * dc, int left, int top, int right, int bot * * Get the clipping rectangle in device coordinates. */ -int get_clip_box( DC *dc, RECT *rect ) +static int get_clip_box( DC *dc, RECT *rect ) { int ret = ERROR; HRGN rgn, clip = get_clip_region( dc ); @@ -74,6 +74,23 @@ int get_clip_box( DC *dc, RECT *rect ) } /*********************************************************************** + * clip_visrect + * + * Clip a rectangle to the DC visible rect. + */ +BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) +{ + RECT clip; + + if (!get_clip_box( dc, &clip )) + { + *dst = *src; + return !is_rect_empty( dst ); + } + return intersect_rect( dst, src, &clip ); +} + +/*********************************************************************** * CLIPPING_UpdateGCRegion * * Update the GC clip region when the ClipRgn or VisRgn have changed. diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index bc9564a..0b8bb76 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -403,7 +403,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he INT ret = 0; INT height = abs( src_info->bmiHeader.biHeight ); BOOL top_down = src_info->bmiHeader.biHeight < 0, non_stretch_from_origin = FALSE; - RECT rect, clip_rect; + RECT rect; TRACE("%d %d %d %d <- %d %d %d %d rop %08x\n", xDst, yDst, widthDst, heightDst, xSrc, ySrc, widthSrc, heightSrc, rop); @@ -487,11 +487,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he get_bounding_rect( &rect, dst.x, dst.y, dst.width, dst.height ); - if (get_clip_box( dc, &clip_rect )) - intersect_rect( &dst.visrect, &rect, &clip_rect ); - else - dst.visrect = rect; - if (is_rect_empty( &dst.visrect )) goto done; + if (!clip_visrect( dc, &dst.visrect, &rect )) goto done; if (!intersect_vis_rectangles( &dst, &src )) goto done; @@ -796,11 +792,11 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR dst.height = cy; if (GetLayout( dev->hdc ) & LAYOUT_RTL) dst.x -= cx - 1; - dst.visrect.left = dst.x; - dst.visrect.top = dst.y; - dst.visrect.right = dst.x + cx; - dst.visrect.bottom = dst.y + cy; - if (get_clip_box( dc, &rect )) intersect_rect( &dst.visrect, &dst.visrect, &rect ); + rect.left = dst.x; + rect.top = dst.y; + rect.right = dst.x + cx; + rect.bottom = dst.y + cy; + if (!clip_visrect( dc, &dst.visrect, &rect )) goto done; offset_rect( &src.visrect, dst.x - src.x, dst.y - src.y ); intersect_rect( &rect, &src.visrect, &dst.visrect ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a785283..0d308b0 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1863,13 +1863,11 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect struct gdi_image_bits bits; struct bitblt_coords src, dst; PHYSDEV dst_dev; - RECT clip; dst_dev = GET_DC_PHYSDEV( dc, pPutImage ); src.visrect = get_total_extents( dev->hdc, x, y, flags, aa_flags, str, count, dx ); if (flags & ETO_CLIPPED) intersect_rect( &src.visrect, &src.visrect, rect ); - if (get_clip_box( dc, &clip )) intersect_rect( &src.visrect, &src.visrect, &clip ); - if (is_rect_empty( &src.visrect )) return TRUE; + if (!clip_visrect( dc, &src.visrect, &src.visrect )) return TRUE; /* FIXME: check for ETO_OPAQUE and avoid GetImage */ src.x = src.visrect.left; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index fe879ac..c01c2f5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -212,7 +212,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */ -extern int get_clip_box( DC *dc, RECT *rect ) DECLSPEC_HIDDEN; +extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; /* Return the total clip region (if any) */

1 0

Alexandre Julliard : gdi32: Maintain a region inside gdi32 to keep track of the total visible region.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 5a1a6e935a8a42c63712e9a41f6b779ce13426d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1a6e935a8a42c63712e9a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 13:08:19 2011 +0100 gdi32: Maintain a region inside gdi32 to keep track of the total visible region. --- dlls/gdi32/clipping.c | 52 +++++++++++++-------------------------------- dlls/gdi32/dc.c | 3 ++ dlls/gdi32/gdi_private.h | 15 +++++++++--- 3 files changed, 29 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 53ad56b..b4d77d3 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -53,27 +53,6 @@ static inline RECT get_clip_rect( DC * dc, int left, int top, int right, int bot } /*********************************************************************** - * get_clip_box - * - * Get the clipping rectangle in device coordinates. - */ -static int get_clip_box( DC *dc, RECT *rect ) -{ - int ret = ERROR; - HRGN rgn, clip = get_clip_region( dc ); - - if (!clip) return GetRgnBox( dc->hVisRgn, rect ); - - if ((rgn = CreateRectRgn( 0, 0, 0, 0 ))) - { - CombineRgn( rgn, dc->hVisRgn, clip, RGN_AND ); - ret = GetRgnBox( rgn, rect ); - DeleteObject( rgn ); - } - return ret; -} - -/*********************************************************************** * clip_visrect * * Clip a rectangle to the DC visible rect. @@ -82,7 +61,7 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) { RECT clip; - if (!get_clip_box( dc, &clip )) + if (!GetRgnBox( get_dc_region(dc), &clip )) { *dst = *src; return !is_rect_empty( dst ); @@ -105,13 +84,22 @@ void CLIPPING_UpdateGCRegion( DC * dc ) { if (!dc->hMetaClipRgn) dc->hMetaClipRgn = CreateRectRgn( 0, 0, 0, 0 ); CombineRgn( dc->hMetaClipRgn, dc->hClipRgn, dc->hMetaRgn, RGN_AND ); - clip_rgn = dc->hMetaClipRgn; } else /* only one is set, no need for an intersection */ { if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); dc->hMetaClipRgn = 0; - clip_rgn = dc->hMetaRgn ? dc->hMetaRgn : dc->hClipRgn; + } + clip_rgn = get_clip_region( dc ); + if (clip_rgn || dc->hVisRgn) + { + if (!dc->region) dc->region = CreateRectRgn( 0, 0, 0, 0 ); + CombineRgn( dc->region, dc->hVisRgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + } + else + { + if (dc->region) DeleteObject( dc->region ); + dc->region = 0; } physdev->funcs->pSetDeviceClipping( physdev, dc->hVisRgn, clip_rgn ); } @@ -365,7 +353,6 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) { POINT pt; BOOL ret; - HRGN clip; DC *dc = get_dc_ptr( hdc ); TRACE("%p %d,%d\n", hdc, x, y ); @@ -375,8 +362,7 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) pt.y = y; LPtoDP( hdc, &pt, 1 ); update_dc( dc ); - ret = PtInRegion( dc->hVisRgn, pt.x, pt.y ); - if (ret && (clip = get_clip_region(dc))) ret = PtInRegion( clip, pt.x, pt.y ); + ret = PtInRegion( get_dc_region(dc), pt.x, pt.y ); release_dc_ptr( dc ); return ret; } @@ -389,7 +375,6 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) { RECT tmpRect; BOOL ret; - HRGN clip; DC *dc = get_dc_ptr( hdc ); if (!dc) return FALSE; TRACE("%p %s\n", hdc, wine_dbgstr_rect( rect )); @@ -398,14 +383,7 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) LPtoDP( hdc, (POINT *)&tmpRect, 2 ); update_dc( dc ); - if ((clip = get_clip_region(dc))) - { - HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 ); - CombineRgn( hrgn, dc->hVisRgn, clip, RGN_AND ); - ret = RectInRegion( hrgn, &tmpRect ); - DeleteObject( hrgn ); - } - else ret = RectInRegion( dc->hVisRgn, &tmpRect ); + ret = RectInRegion( get_dc_region(dc), &tmpRect ); release_dc_ptr( dc ); return ret; } @@ -421,7 +399,7 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) if (!dc) return ERROR; update_dc( dc ); - ret = get_clip_box( dc, rect ); + ret = GetRgnBox( get_dc_region(dc), rect ); if (dc->layout & LAYOUT_RTL) { int tmp = rect->left; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b357cee..77897e9 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -103,6 +103,7 @@ DC *alloc_dc_ptr( WORD magic ) dc->hMetaRgn = 0; dc->hMetaClipRgn = 0; dc->hVisRgn = 0; + dc->region = 0; dc->hPen = GDI_inc_ref_count( GetStockObject( BLACK_PEN )); dc->hBrush = GDI_inc_ref_count( GetStockObject( WHITE_BRUSH )); dc->hFont = GDI_inc_ref_count( GetStockObject( SYSTEM_FONT )); @@ -174,6 +175,7 @@ static void free_dc_state( DC *dc ) if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); + if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); HeapFree( GetProcessHeap(), 0, dc ); } @@ -418,6 +420,7 @@ INT nulldrv_SaveDC( PHYSDEV dev ) /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ + newdc->region = 0; newdc->hVisRgn = 0; newdc->hClipRgn = 0; newdc->hMetaRgn = 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c01c2f5..f499de0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -104,10 +104,11 @@ typedef struct tagDC int flags; DWORD layout; - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hMetaRgn; /* Meta region (may be 0) */ - HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */ - HRGN hVisRgn; /* Visible region (must never be 0) */ + HRGN hClipRgn; /* Clip region */ + HRGN hMetaRgn; /* Meta region */ + HRGN hMetaClipRgn; /* Intersection of meta and clip regions */ + HRGN hVisRgn; /* Visible region */ + HRGN region; /* Total DC region (intersection of clip and visible) */ HPEN hPen; HBRUSH hBrush; HFONT hFont; @@ -223,6 +224,12 @@ static inline HRGN get_clip_region( DC * dc ) return dc->hClipRgn; } +/* Return the total DC region (if any) */ +static inline HRGN get_dc_region( DC *dc ) +{ + return dc->region; +} + /* dc.c */ extern DC *alloc_dc_ptr( WORD magic ) DECLSPEC_HIDDEN; extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Pass the total visible region in the SetDeviceClipping driver entry point.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 7534d47b1ba75886297bca2c653a28cc41c2a28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7534d47b1ba75886297bca2c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 13:15:35 2011 +0100 gdi32: Pass the total visible region in the SetDeviceClipping driver entry point. --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/dibdrv/dc.c | 9 +++++---- dlls/gdi32/driver.c | 2 +- dlls/winex11.drv/graphics.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xrender.c | 4 ++-- include/wine/gdi_driver.h | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index b4d77d3..7f69950 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -101,7 +101,7 @@ void CLIPPING_UpdateGCRegion( DC * dc ) if (dc->region) DeleteObject( dc->region ); dc->region = 0; } - physdev->funcs->pSetDeviceClipping( physdev, dc->hVisRgn, clip_rgn ); + physdev->funcs->pSetDeviceClipping( physdev, dc->region ); } /*********************************************************************** diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 8af8c85..f9b5e7b 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -475,14 +475,15 @@ static INT dibdrv_SetBkMode( PHYSDEV dev, INT mode ) /*********************************************************************** * dibdrv_SetDeviceClipping */ -static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - TRACE("(%p, %p, %p)\n", dev, vis_rgn, clip_rgn); + TRACE("(%p, %p)\n", dev, rgn); - CombineRgn( pdev->clip, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); - return next->funcs->pSetDeviceClipping( next, vis_rgn, clip_rgn); + SetRectRgn( pdev->clip, 0, 0, pdev->dib.width, pdev->dib.height ); + if (rgn) CombineRgn( pdev->clip, pdev->clip, rgn, RGN_AND ); + return next->funcs->pSetDeviceClipping( next, rgn ); } /*********************************************************************** diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 26048b4..15481ac 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -582,7 +582,7 @@ static UINT nulldrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const R return 0; } -static void nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +static void nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { } diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index f2cf037..4f76a1f 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -239,12 +239,12 @@ void restore_clipping_region( X11DRV_PDEVICE *dev, RGNDATA *data ) /*********************************************************************** * X11DRV_SetDeviceClipping */ -void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { RGNDATA *data; X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + CombineRgn( physDev->region, rgn, 0, RGN_COPY ); if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) update_x11_clipping( physDev, data ); HeapFree( GetProcessHeap(), 0, data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d90968d..f1f22bd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -230,7 +230,7 @@ extern HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; -extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) DECLSPEC_HIDDEN; +extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern UINT X11DRV_SetDIBColorTable( PHYSDEV dev, UINT start, UINT count, const RGBQUAD *colors ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 1c15d2a..5aafd2d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1337,14 +1337,14 @@ static DWORD xrenderdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info /*********************************************************************** * xrenderdrv_SetDeviceClipping */ -static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); physdev->update_clip = TRUE; dev = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); - dev->funcs->pSetDeviceClipping( dev, vis_rgn, clip_rgn ); + dev->funcs->pSetDeviceClipping( dev, rgn ); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index d996fb4..b3241c0 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -159,7 +159,7 @@ struct gdi_dc_funcs COLORREF (*pSetDCPenColor)(PHYSDEV, COLORREF); UINT (*pSetDIBColorTable)(PHYSDEV,UINT,UINT,const RGBQUAD*); INT (*pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,BITMAPINFO*,UINT); - VOID (*pSetDeviceClipping)(PHYSDEV,HRGN,HRGN); + VOID (*pSetDeviceClipping)(PHYSDEV,HRGN); BOOL (*pSetDeviceGammaRamp)(PHYSDEV,LPVOID); DWORD (*pSetLayout)(PHYSDEV,DWORD); INT (*pSetMapMode)(PHYSDEV,INT); @@ -205,7 +205,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 19 +#define WINE_GDI_DRIVER_VERSION 20 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Piotr Caban : msvcp90: Added _Getcoll implementation.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 34d947189a665152de54dd8874aedfab31e1b3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d947189a665152de54dd887… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:49:16 2011 +0100 msvcp90: Added _Getcoll implementation. --- dlls/msvcp90/locale.c | 18 +++++++++++++++--- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0cc0c58..a319d12 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -846,14 +846,26 @@ _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char return _Locinfo__Locinfo_Addcats(this, category, locstr); } +/* _Getcoll */ +_Collvec __cdecl _Getcoll(void) +{ + _Collvec ret; + _locale_t locale = _get_current_locale(); + + TRACE("\n"); + + ret.page = locale->locinfo->lc_collate_cp; + ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; + _free_locale(locale); + return ret; +} + /* ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ */ /* ?_Getcoll(a)_Locinfo@std@@QEBA?AU_Collvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcoll, 4) _Collvec __thiscall _Locinfo__Getcoll(const _Locinfo *this) { - _Collvec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); - return ret; + return _Getcoll(); } /* ?_Getctype(a)_Locinfo@std@@QBE?AU_Ctypevec@@XZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 43cc50e..2464328 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5750,7 +5750,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ stub _Getcoll +@ cdecl _Getcoll() @ stub _Getctype @ stub _Getcvt @ stub _Getdateorder

1 0