September 2010 - Wine-commits

Jörg Höhle : winmm: MCI open always creates an alias for subsequent commands.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: ef372e259a6663e9e2ef19b5d984110aa713560b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef372e259a6663e9e2ef19b5d… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Wed Sep 1 17:50:43 2010 +0200 winmm: MCI open always creates an alias for subsequent commands. --- dlls/winmm/mci.c | 31 +++++++++++++++++-------------- dlls/winmm/tests/mci.c | 2 +- dlls/winmm/winemm.h | 1 - 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index d604c98..2b47bd8 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -123,7 +123,7 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) EnterCriticalSection(&WINMM_cs); for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { - if (wmd->lpstrElementName && strcmpW(wmd->lpstrElementName, lpstrName) == 0) { + if (wmd->lpstrAlias && strcmpiW(wmd->lpstrAlias, lpstrName) == 0) { ret = wmd->wDeviceID; break; } @@ -131,10 +131,6 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) ret = wmd->wDeviceID; break; } - if (wmd->lpstrAlias && strcmpiW(wmd->lpstrAlias, lpstrName) == 0) { - ret = wmd->wDeviceID; - break; - } } LeaveCriticalSection(&WINMM_cs); @@ -770,7 +766,6 @@ static BOOL MCI_UnLoadMciDriver(LPWINE_MCIDRIVER wmd) HeapFree(GetProcessHeap(), 0, wmd->lpstrDeviceType); HeapFree(GetProcessHeap(), 0, wmd->lpstrAlias); - HeapFree(GetProcessHeap(), 0, wmd->lpstrElementName); HeapFree(GetProcessHeap(), 0, wmd); return TRUE; @@ -888,15 +883,23 @@ static DWORD MCI_SendCommandFrom32(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dw static DWORD MCI_FinishOpen(LPWINE_MCIDRIVER wmd, LPMCI_OPEN_PARMSW lpParms, DWORD dwParam) { - if (dwParam & MCI_OPEN_ELEMENT) - { - wmd->lpstrElementName = HeapAlloc(GetProcessHeap(),0,(strlenW(lpParms->lpstrElementName)+1) * sizeof(WCHAR)); - strcpyW( wmd->lpstrElementName, lpParms->lpstrElementName ); + LPCWSTR alias = NULL; + /* Open always defines an alias for further reference */ + if (dwParam & MCI_OPEN_ALIAS) /* open ... alias */ + alias = lpParms->lpstrAlias; + else { + if ((dwParam & MCI_OPEN_ELEMENT) /* open file.wav */ + && !(dwParam & MCI_OPEN_ELEMENT_ID)) + alias = lpParms->lpstrElementName; + else if (dwParam & MCI_OPEN_TYPE ) /* open cdaudio */ + alias = wmd->lpstrDeviceType; } - if (dwParam & MCI_OPEN_ALIAS) - { - wmd->lpstrAlias = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpParms->lpstrAlias)+1) * sizeof(WCHAR)); - strcpyW( wmd->lpstrAlias, lpParms->lpstrAlias); + if (alias) { + wmd->lpstrAlias = HeapAlloc(GetProcessHeap(), 0, (strlenW(alias)+1) * sizeof(WCHAR)); + if (!wmd->lpstrAlias) return MCIERR_OUT_OF_MEMORY; + strcpyW( wmd->lpstrAlias, alias); + /* In most cases, natives adds MCI_OPEN_ALIAS to the flags passed to the driver. + * Don't. The drivers don't care about the winmm alias. */ } lpParms->wDeviceID = wmd->wDeviceID; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 66633bc..642e346 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -644,7 +644,7 @@ static void test_asyncWAVE(HWND hwnd) /* Only the alias is looked up. */ err = mciGetDeviceID("tempfile.wav"); - todo_wine ok(err==0,"mciGetDeviceID element returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID element returned %u, expected 0\n", err); err = mciGetDeviceID("waveaudio"); todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 75dc1e4..6d170de 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -95,7 +95,6 @@ typedef struct { typedef struct tagWINE_MCIDRIVER { UINT wDeviceID; UINT wType; - LPWSTR lpstrElementName; LPWSTR lpstrDeviceType; LPWSTR lpstrAlias; HDRVR hDriver;

1 0

Piotr Caban : msvcp90/tests: Added basic_string<{char, wchar_t}>.data tests.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: ee9319eac787804a848c4ff557fcf973aa8a538a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9319eac787804a848c4ff55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 2 00:34:32 2010 +0200 msvcp90/tests: Added basic_string<{char,wchar_t}>.data tests. --- dlls/msvcp90/tests/string.c | 47 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee9319eac787804a848c4…

1 0

Piotr Caban : msvcp90: Added basic_string<{char, wchar_t}>.{length, size} implementation.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: ec8cdcc2277ebbff428bad1c9b741e0ad79d459e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8cdcc2277ebbff428bad1c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 2 00:34:57 2010 +0200 msvcp90: Added basic_string<{char, wchar_t}>.{length, size} implementation. --- dlls/msvcp90/msvcp90.spec | 16 ++++++++-------- dlls/msvcp90/string.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 4097ba7..8505614 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -4456,12 +4456,12 @@ @ stub ?ldexp@?$_Ctraits(a)M@std@@SAMMH(a)Z @ stub ?ldexp@?$_Ctraits(a)N@std@@SANNH(a)Z @ stub ?ldexp@?$_Ctraits(a)O@std@@SAOOH(a)Z -@ stub -arch=win32 ?length@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ -@ stub -arch=win64 ?length@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?length@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_char_length +@ cdecl -arch=win64 ?length@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_char_length @ stub -arch=win32 ?length@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIXZ @ stub -arch=win64 ?length@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KXZ -@ stub -arch=win32 ?length@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ -@ stub -arch=win64 ?length@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?length@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_wchar_length +@ cdecl -arch=win64 ?length@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_wchar_length @ cdecl -arch=win32 ?length@?$char_traits(a)D@std@@SAIPBD(a)Z(ptr) MSVCP_char_traits_char_length @ cdecl -arch=win64 ?length@?$char_traits(a)D@std@@SA_KPEBD(a)Z(ptr) MSVCP_char_traits_char_length @ cdecl -arch=win32 ?length@?$char_traits(a)G@std@@SAIPBG(a)Z(ptr) MSVCP_char_traits_short_length @@ -5407,12 +5407,12 @@ @ stub ?sin@?$_Ctraits(a)M@std@@SAMM(a)Z @ stub ?sin@?$_Ctraits(a)N@std@@SANN(a)Z @ stub ?sin@?$_Ctraits(a)O@std@@SAOO(a)Z -@ stub -arch=win32 ?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ -@ stub -arch=win64 ?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_char_length +@ cdecl -arch=win64 ?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_char_length @ stub -arch=win32 ?size@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIXZ @ stub -arch=win64 ?size@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KXZ -@ stub -arch=win32 ?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ -@ stub -arch=win64 ?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_wchar_length +@ cdecl -arch=win64 ?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_wchar_length @ stub -arch=win32 ?snextc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ @ stub -arch=win64 ?snextc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ @ stub -arch=win32 ?snextc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAEGXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 5b4b11f..291d158 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -742,6 +742,17 @@ void __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) basic_string_char_tidy(this, TRUE, 0); } +/* ?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ */ +/* ?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ */ +/* ?length@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ */ +/* ?length@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_length, 4) +size_t __thiscall MSVCP_basic_string_char_length(basic_string_char *this) +{ + TRACE("%p\n", this); + return this->size; +} + /* basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t>> */ /* ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2IB */ @@ -989,3 +1000,14 @@ void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) TRACE("%p\n", this); basic_string_wchar_tidy(this, TRUE, 0); } + +/* ?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ */ +/* ?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ */ +/* ?length@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ */ +/* ?length@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_length, 4) +size_t __thiscall MSVCP_basic_string_wchar_length(basic_string_wchar *this) +{ + TRACE("%p\n", this); + return this->size; +}

1 0

Piotr Caban : msvcp90/tests: Added basic_string<{char, wchar_t}>.size tests.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 57f3a88cda28d4540b7804fdbb99aeaff5a48028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f3a88cda28d4540b7804fdb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 2 00:35:26 2010 +0200 msvcp90/tests: Added basic_string<{char,wchar_t}>.size tests. --- dlls/msvcp90/tests/string.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index eacdef7..dc9a1ee 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -59,6 +59,7 @@ static basic_string_char* (WINAPI *p_basic_string_char_erase)(size_t, size_t); static basic_string_char* (WINAPI *p_basic_string_char_assign_cstr_len)(const char*, size_t); static const char* (WINAPI *p_basic_string_char_cstr)(void); static const char* (WINAPI *p_basic_string_char_data)(void); +static size_t (WINAPI *p_basic_string_char_size)(void); static basic_string_wchar* (WINAPI *p_basic_string_wchar_ctor)(void); static basic_string_wchar* (WINAPI *p_basic_string_wchar_copy_ctor)(basic_string_wchar*); @@ -68,6 +69,7 @@ static basic_string_wchar* (WINAPI *p_basic_string_wchar_erase)(size_t, size_t); static basic_string_wchar* (WINAPI *p_basic_string_wchar_assign_cstr_len)(const wchar_t*, size_t); static const wchar_t* (WINAPI *p_basic_string_wchar_cstr)(void); static const wchar_t* (WINAPI *p_basic_string_wchar_data)(void); +static size_t (WINAPI *p_basic_string_wchar_size)(void); #else static basic_string_char* (__cdecl *p_basic_string_char_ctor)(basic_string_char*); static basic_string_char* (__cdecl *p_basic_string_char_copy_ctor)(basic_string_char*, basic_string_char*); @@ -77,6 +79,7 @@ static basic_string_char* (__cdecl *p_basic_string_char_erase)(basic_string_char static basic_string_char* (__cdecl *p_basic_string_char_assign_cstr_len)(basic_string_char*, const char*, size_t); static const char* (__cdecl *p_basic_string_char_cstr)(basic_string_char*); static const char* (__cdecl *p_basic_string_char_data)(basic_string_char*); +static size_t (__cdecl *p_basic_string_char_size)(basic_string_char*); static basic_string_wchar* (__cdecl *p_basic_string_wchar_ctor)(basic_string_wchar*); static basic_string_wchar* (__cdecl *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); @@ -86,6 +89,7 @@ static basic_string_wchar* (__cdecl *p_basic_string_wchar_erase)(basic_string_wc static basic_string_wchar* (__cdecl *p_basic_string_wchar_assign_cstr_len)(basic_string_wchar*, const wchar_t*, size_t); static const wchar_t* (__cdecl *p_basic_string_wchar_cstr)(basic_string_wchar*); static const wchar_t* (__cdecl *p_basic_string_wchar_data)(basic_string_wchar*); +static size_t (__cdecl *p_basic_string_wchar_size)(basic_string_wchar*); #endif static int invalid_parameter = 0; @@ -234,6 +238,8 @@ static BOOL init(void) "?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ"); p_basic_string_char_data = (void*)GetProcAddress(msvcp, "?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ"); + p_basic_string_char_size = (void*)GetProcAddress(msvcp, + "?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ"); @@ -251,6 +257,8 @@ static BOOL init(void) "?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ"); p_basic_string_wchar_data = (void*)GetProcAddress(msvcp, "?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ"); + p_basic_string_wchar_size = (void*)GetProcAddress(msvcp, + "?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ"); } else { p_basic_string_char_ctor = (void*)GetProcAddress(msvcp, @@ -269,6 +277,8 @@ static BOOL init(void) "?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ"); p_basic_string_char_data = (void*)GetProcAddress(msvcp, "?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ"); + p_basic_string_char_size = (void*)GetProcAddress(msvcp, + "?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ"); @@ -286,6 +296,8 @@ static BOOL init(void) "?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ"); p_basic_string_wchar_data = (void*)GetProcAddress(msvcp, "?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ"); + p_basic_string_wchar_size = (void*)GetProcAddress(msvcp, + "?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ"); } return TRUE; @@ -294,11 +306,13 @@ static BOOL init(void) static void test_basic_string_char(void) { basic_string_char str1, str2, *pstr; const char *str; + size_t size; if(!p_basic_string_char_ctor || !p_basic_string_char_copy_ctor || !p_basic_string_char_ctor_cstr || !p_basic_string_char_dtor || !p_basic_string_char_erase || !p_basic_string_char_assign_cstr_len - || !p_basic_string_char_cstr || !p_basic_string_char_data) { + || !p_basic_string_char_cstr || !p_basic_string_char_data + || !p_basic_string_char_size) { win_skip("basic_string<char> unavailable\n"); return; } @@ -319,6 +333,8 @@ static void test_basic_string_char(void) { ok(!memcmp(str, "test", 5), "str = %s\n", str); str = call_func1(p_basic_string_char_data, &str1); ok(!memcmp(str, "test", 5), "str = %s\n", str); + size = (size_t)call_func1(p_basic_string_char_size, &str1); + ok(size == 4, "size = %lu\n", (unsigned long)size); pstr = call_func2(p_basic_string_char_copy_ctor, &str2, &str1); ok(pstr == &str2, "pstr != &str2\n"); @@ -332,12 +348,16 @@ static void test_basic_string_char(void) { ok(!memcmp(str, "tt", 3), "str = %s\n", str); str = call_func1(p_basic_string_char_data, &str2); ok(!memcmp(str, "tt", 3), "str = %s\n", str); + size = (size_t)call_func1(p_basic_string_char_size, &str1); + ok(size == 4, "size = %lu\n", (unsigned long)size); call_func3(p_basic_string_char_erase, &str2, 1, 100); str = call_func1(p_basic_string_char_cstr, &str2); ok(!memcmp(str, "t", 2), "str = %s\n", str); str = call_func1(p_basic_string_char_data, &str2); ok(!memcmp(str, "t", 2), "str = %s\n", str); + size = (size_t)call_func1(p_basic_string_char_size, &str1); + ok(size == 4, "size = %lu\n", (unsigned long)size); call_func3(p_basic_string_char_assign_cstr_len, &str2, "test", 4); str = call_func1(p_basic_string_char_cstr, &str2); @@ -360,11 +380,13 @@ static void test_basic_string_wchar(void) { basic_string_wchar str1, str2, *pstr; const wchar_t *str; + size_t size; if(!p_basic_string_wchar_ctor || !p_basic_string_wchar_copy_ctor || !p_basic_string_wchar_ctor_cstr || !p_basic_string_wchar_dtor || !p_basic_string_wchar_erase || !p_basic_string_wchar_assign_cstr_len - || !p_basic_string_wchar_cstr || !p_basic_string_wchar_data) { + || !p_basic_string_wchar_cstr || !p_basic_string_wchar_data + || !p_basic_string_wchar_size) { win_skip("basic_string<wchar_t> unavailable\n"); return; } @@ -385,6 +407,8 @@ static void test_basic_string_wchar(void) { ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str1); ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + size = (size_t)call_func1(p_basic_string_char_size, &str1); + ok(size == 4, "size = %lu\n", (unsigned long)size); memset(&str2, 0, sizeof(basic_string_wchar)); pstr = call_func2(p_basic_string_wchar_copy_ctor, &str2, &str1); @@ -399,12 +423,16 @@ static void test_basic_string_wchar(void) { ok(str[0]=='t' && str[1]=='t' && str[2]=='\0', "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); ok(str[0]=='t' && str[1]=='t' && str[2]=='\0', "str = %s\n", wine_dbgstr_w(str)); + size = (size_t)call_func1(p_basic_string_char_size, &str1); + ok(size == 4, "size = %lu\n", (unsigned long)size); call_func3(p_basic_string_wchar_erase, &str2, 1, 100); str = call_func1(p_basic_string_wchar_cstr, &str2); ok(str[0]=='t' && str[1]=='\0', "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); ok(str[0]=='t' && str[1]=='\0', "str = %s\n", wine_dbgstr_w(str)); + size = (size_t)call_func1(p_basic_string_char_size, &str1); + ok(size == 4, "size = %lu\n", (unsigned long)size); call_func3(p_basic_string_wchar_assign_cstr_len, &str2, test, 4); str = call_func1(p_basic_string_wchar_cstr, &str2);

1 0

Piotr Caban : msvcp90: Added basic_string<{char, wchar_t}> equal operator implementation.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: d09287619d60214da7a5fba116d09aebe70045b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09287619d60214da7a5fba11… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 2 00:35:55 2010 +0200 msvcp90: Added basic_string<{char, wchar_t}> equal operator implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 8505614..d7f368a 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1380,8 +1380,8 @@ @ cdecl -arch=win64 ??4?$allocator(a)X@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_void_assign @ thiscall -arch=win32 ??4?$allocator(a)_W@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_allocator_wchar_assign @ cdecl -arch=win64 ??4?$allocator(a)_W@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_assign -@ stub -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_char_assign +@ cdecl -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_assign @ stub -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z @ stub -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z @ stub -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z @@ -1392,8 +1392,8 @@ @ stub -arch=win64 ??4?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)G@Z @ stub -arch=win32 ??4?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV01(a)PBG@Z @ stub -arch=win64 ??4?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)PEBG@Z -@ stub -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_char_assign +@ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_assign @ stub -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z @ stub -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z @ stub -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 291d158..fad3346 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -647,6 +647,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_substr( /* ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@@Z */ /* ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@@Z */ +/* ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign, 8) basic_string_char* __thiscall MSVCP_basic_string_char_assign( basic_string_char *this, const basic_string_char *assign) @@ -906,6 +908,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_substr( /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@@Z */ /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)AEBV12@@Z */ +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign, 8) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign( basic_string_wchar *this, const basic_string_wchar *assign)

1 0

Alexandre Julliard : user32: Set the DC layout to mirrored when the window has the WS_EX_LAYOUTRTL style .
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 30d2079574c19d65eb4ff1f686d5f016cdc6c0bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d2079574c19d65eb4ff1f68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 2 15:16:39 2010 +0200 user32: Set the DC layout to mirrored when the window has the WS_EX_LAYOUTRTL style. --- dlls/user32/painting.c | 2 + dlls/user32/tests/dce.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 969c63e..1b0cc3d 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1030,6 +1030,8 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) bUpdateVisRgn = TRUE; } + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) SetLayout( dce->hdc, LAYOUT_RTL ); + dce->hwnd = hwnd; dce->flags = (dce->flags & ~user_flags) | (flags & user_flags); diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index c366ebc..f077fcb 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -424,6 +424,87 @@ static void test_invisible_create(void) DestroyWindow(hwnd_owndc); } +static void test_dc_layout(void) +{ + DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); + DWORD (WINAPI *pGetLayout)(HDC hdc); + HWND hwnd_cache_rtl, hwnd_owndc_rtl, hwnd_classdc_rtl, hwnd_classdc2_rtl; + HDC hdc; + DWORD layout; + HMODULE mod = GetModuleHandleA("gdi32.dll"); + + pGetLayout = (void *)GetProcAddress( mod, "GetLayout" ); + pSetLayout = (void *)GetProcAddress( mod, "SetLayout" ); + if (!pGetLayout || !pSetLayout) + { + win_skip( "Don't have SetLayout\n" ); + return; + } + + hdc = GetDC( hwnd_cache ); + pSetLayout( hdc, LAYOUT_RTL ); + layout = pGetLayout( hdc ); + ReleaseDC( hwnd_cache, hdc ); + if (!layout) + { + win_skip( "SetLayout not supported\n" ); + return; + } + + hwnd_cache_rtl = CreateWindowExA(WS_EX_LAYOUTRTL, "cache_class", NULL, WS_OVERLAPPED | WS_VISIBLE, + 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + hwnd_owndc_rtl = CreateWindowExA(WS_EX_LAYOUTRTL, "owndc_class", NULL, WS_OVERLAPPED | WS_VISIBLE, + 0, 200, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + hwnd_classdc_rtl = CreateWindowExA(WS_EX_LAYOUTRTL, "classdc_class", NULL, WS_OVERLAPPED | WS_VISIBLE, + 200, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + hwnd_classdc2_rtl = CreateWindowExA(WS_EX_LAYOUTRTL, "classdc_class", NULL, WS_OVERLAPPED | WS_VISIBLE, + 200, 200, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + hdc = GetDC( hwnd_cache_rtl ); + layout = pGetLayout( hdc ); + + ok( layout == LAYOUT_RTL, "wrong layout %x\n", layout ); + pSetLayout( hdc, 0 ); + ReleaseDC( hwnd_cache_rtl, hdc ); + hdc = GetDC( hwnd_owndc_rtl ); + layout = pGetLayout( hdc ); + ok( layout == LAYOUT_RTL, "wrong layout %x\n", layout ); + ReleaseDC( hwnd_cache_rtl, hdc ); + + hdc = GetDC( hwnd_cache ); + layout = pGetLayout( hdc ); + ok( layout == 0, "wrong layout %x\n", layout ); + ReleaseDC( hwnd_cache, hdc ); + + hdc = GetDC( hwnd_owndc_rtl ); + layout = pGetLayout( hdc ); + ok( layout == LAYOUT_RTL, "wrong layout %x\n", layout ); + pSetLayout( hdc, 0 ); + ReleaseDC( hwnd_owndc_rtl, hdc ); + hdc = GetDC( hwnd_owndc_rtl ); + layout = pGetLayout( hdc ); + ok( layout == LAYOUT_RTL, "wrong layout %x\n", layout ); + ReleaseDC( hwnd_owndc_rtl, hdc ); + + hdc = GetDC( hwnd_classdc_rtl ); + layout = pGetLayout( hdc ); + ok( layout == LAYOUT_RTL, "wrong layout %x\n", layout ); + pSetLayout( hdc, 0 ); + ReleaseDC( hwnd_classdc_rtl, hdc ); + hdc = GetDC( hwnd_classdc2_rtl ); + layout = pGetLayout( hdc ); + ok( layout == LAYOUT_RTL, "wrong layout %x\n", layout ); + ReleaseDC( hwnd_classdc2_rtl, hdc ); + hdc = GetDC( hwnd_classdc ); + layout = pGetLayout( hdc ); + ok( layout == LAYOUT_RTL, "wrong layout %x\n", layout ); + ReleaseDC( hwnd_classdc_rtl, hdc ); + + DestroyWindow(hwnd_classdc2_rtl); + DestroyWindow(hwnd_classdc_rtl); + DestroyWindow(hwnd_owndc_rtl); + DestroyWindow(hwnd_cache_rtl); +} + static void test_destroyed_window(void) { HDC dc; @@ -480,6 +561,7 @@ START_TEST(dce) test_dc_visrgn(); test_begin_paint(); test_invisible_create(); + test_dc_layout(); DestroyWindow(hwnd_classdc2); DestroyWindow(hwnd_classdc);

1 0

Alexandre Julliard : user32: Make child windows inherit the WS_EX_LAYOUTRTL style from their parent.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 942866f90d511234e767dfb2e3374216b0f66a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=942866f90d511234e767dfb2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 2 15:46:43 2010 +0200 user32: Make child windows inherit the WS_EX_LAYOUTRTL style from their parent. --- dlls/user32/tests/win.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/win.c | 6 ++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b9966e7..057e3fc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -53,6 +53,8 @@ static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); +static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); +static DWORD (WINAPI *pGetLayout)(HDC hdc); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -4829,6 +4831,33 @@ static void test_CreateWindow(void) ok( rc.bottom <= expected_cy, "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); + if (pGetLayout && pSetLayout) + { + HDC hdc = GetDC( parent ); + pSetLayout( hdc, LAYOUT_RTL ); + if (pGetLayout( hdc )) + { + ReleaseDC( parent, hdc ); + DestroyWindow( parent ); + SetLastError( 0xdeadbeef ); + parent = CreateWindowEx(WS_EX_APPWINDOW | WS_EX_LAYOUTRTL, "static", NULL, WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL); + ok( parent != 0, "creation failed err %u\n", GetLastError()); + expect_ex_style( parent, WS_EX_APPWINDOW | WS_EX_LAYOUTRTL ); + hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD, 0, 0, 20, 20, parent, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + expect_ex_style( hwnd, WS_EX_LAYOUTRTL ); + DestroyWindow( hwnd ); + SetWindowLongW( parent, GWL_EXSTYLE, WS_EX_APPWINDOW | WS_EX_LAYOUTRTL | WS_EX_NOINHERITLAYOUT ); + hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD, 0, 0, 20, 20, parent, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + expect_ex_style( hwnd, 0 ); + DestroyWindow( hwnd ); + } + else win_skip( "SetLayout not supported\n" ); + } + else win_skip( "SetLayout not available\n" ); + DestroyWindow(parent); UnregisterClass("MinMax_WndClass", GetModuleHandle(0)); @@ -6047,6 +6076,7 @@ static void test_winregion(void) START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); + HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); pGetAncestor = (void *)GetProcAddress( user32, "GetAncestor" ); pGetWindowInfo = (void *)GetProcAddress( user32, "GetWindowInfo" ); pGetWindowModuleFileNameA = (void *)GetProcAddress( user32, "GetWindowModuleFileNameA" ); @@ -6056,6 +6086,8 @@ START_TEST(win) pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); + pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" ); + pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); if (!RegisterWindowClasses()) assert(0); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 6082b80..e03ce46 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1178,6 +1178,12 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, parent = GetDesktopWindow(); owner = cs->hwndParent; } + else + { + DWORD parent_style = GetWindowLongW( parent, GWL_EXSTYLE ); + if ((parent_style & WS_EX_LAYOUTRTL) && !(parent_style & WS_EX_NOINHERITLAYOUT)) + cs->dwExStyle |= WS_EX_LAYOUTRTL; + } } else {

1 0

Alexandre Julliard : user32: Implement Get/SetProcessDefaultLayout.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 196ec5969d34e23fa8345d387b21d042647bb84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=196ec5969d34e23fa8345d387… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 2 18:01:01 2010 +0200 user32: Implement Get/SetProcessDefaultLayout. --- dlls/user32/misc.c | 48 ----------------------------------------------- dlls/user32/tests/win.c | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 33 ++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 48 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d5a23d1..4b38dd2 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -199,54 +199,6 @@ VOID WINAPI SetDebugErrorLevel( DWORD dwLevel ) } -/****************************************************************************** - * GetProcessDefaultLayout [USER32.@] - * - * Gets the default layout for parentless windows. - * Right now, just returns 0 (left-to-right). - * - * RETURNS - * Success: Nonzero - * Failure: Zero - * - * BUGS - * No RTL - */ -BOOL WINAPI GetProcessDefaultLayout( DWORD *pdwDefaultLayout ) -{ - if ( !pdwDefaultLayout ) { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - FIXME( "( %p ): No BiDi\n", pdwDefaultLayout ); - *pdwDefaultLayout = 0; - return TRUE; -} - - -/****************************************************************************** - * SetProcessDefaultLayout [USER32.@] - * - * Sets the default layout for parentless windows. - * Right now, only accepts 0 (left-to-right). - * - * RETURNS - * Success: Nonzero - * Failure: Zero - * - * BUGS - * No RTL - */ -BOOL WINAPI SetProcessDefaultLayout( DWORD dwDefaultLayout ) -{ - if ( dwDefaultLayout == 0 ) - return TRUE; - FIXME( "( %08x ): No BiDi\n", dwDefaultLayout ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - - /*********************************************************************** * SetWindowStationUser (USER32.@) */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 057e3fc..02d4e7f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -53,6 +53,8 @@ static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); +static BOOL (WINAPI *pGetProcessDefaultLayout)( DWORD *layout ); +static BOOL (WINAPI *pSetProcessDefaultLayout)( DWORD layout ); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); @@ -4853,6 +4855,43 @@ static void test_CreateWindow(void) ok( hwnd != 0, "creation failed err %u\n", GetLastError()); expect_ex_style( hwnd, 0 ); DestroyWindow( hwnd ); + + if (pGetProcessDefaultLayout && pSetProcessDefaultLayout) + { + DWORD layout; + + SetLastError( 0xdeadbeef ); + ok( !pGetProcessDefaultLayout( NULL ), "GetProcessDefaultLayout succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ok( pGetProcessDefaultLayout( &layout ), + "GetProcessDefaultLayout failed err %u\n", GetLastError ()); + ok( layout == 0, "GetProcessDefaultLayout wrong layout %x\n", layout ); + SetLastError( 0xdeadbeef ); + ok( pSetProcessDefaultLayout( 7 ), + "SetProcessDefaultLayout failed err %u\n", GetLastError ()); + ok( pGetProcessDefaultLayout( &layout ), + "GetProcessDefaultLayout failed err %u\n", GetLastError ()); + ok( layout == 7, "GetProcessDefaultLayout wrong layout %x\n", layout ); + SetLastError( 0xdeadbeef ); + ok( pSetProcessDefaultLayout( LAYOUT_RTL ), + "SetProcessDefaultLayout failed err %u\n", GetLastError ()); + ok( pGetProcessDefaultLayout( &layout ), + "GetProcessDefaultLayout failed err %u\n", GetLastError ()); + ok( layout == LAYOUT_RTL, "GetProcessDefaultLayout wrong layout %x\n", layout ); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + expect_ex_style( hwnd, WS_EX_APPWINDOW | WS_EX_LAYOUTRTL ); + DestroyWindow( hwnd ); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP, + 0, 0, 100, 100, parent, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + expect_ex_style( hwnd, WS_EX_APPWINDOW ); + DestroyWindow( hwnd ); + pSetProcessDefaultLayout( 0 ); + } + else win_skip( "SetProcessDefaultLayout not supported\n" ); } else win_skip( "SetLayout not supported\n" ); } @@ -6086,6 +6125,8 @@ START_TEST(win) pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); + pGetProcessDefaultLayout = (void *)GetProcAddress( user32, "GetProcessDefaultLayout" ); + pSetProcessDefaultLayout = (void *)GetProcAddress( user32, "SetProcessDefaultLayout" ); pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" ); pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e03ce46..bbc7fc2 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); #define NB_USER_HANDLES ((LAST_USER_HANDLE - FIRST_USER_HANDLE + 1) >> 1) #define USER_HANDLE_TO_INDEX(hwnd) ((LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1) +static DWORD process_layout; + /**********************************************************************/ /* helper for Get/SetWindowLong */ @@ -1199,6 +1201,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (className != (LPCWSTR)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(className) || strcmpiW( className, messageW ))) parent = GetDesktopWindow(); + if (process_layout & LAYOUT_RTL) cs->dwExStyle |= WS_EX_LAYOUTRTL; } WIN_FixCoordinates(cs, &sw); /* fix default coordinates */ @@ -3484,6 +3487,36 @@ BOOL WINAPI UpdateLayeredWindow( HWND hwnd, HDC hdcDst, POINT *pptDst, SIZE *psi return UpdateLayeredWindowIndirect( hwnd, &info ); } + +/****************************************************************************** + * GetProcessDefaultLayout [USER32.@] + * + * Gets the default layout for parentless windows. + */ +BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) +{ + if (!layout) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + *layout = process_layout; + return TRUE; +} + + +/****************************************************************************** + * SetProcessDefaultLayout [USER32.@] + * + * Sets the default layout for parentless windows. + */ +BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) +{ + process_layout = layout; + return TRUE; +} + + /* 64bit versions */ #ifdef GetWindowLongPtrW

1 0

Octavian Voicu : include: Add MCI_INTEGER64 mci type.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 1435ba6766c24261d4b0d8ed71d956bab77c5e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1435ba6766c24261d4b0d8ed7… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Sep 2 13:52:34 2010 +0300 include: Add MCI_INTEGER64 mci type. --- include/mmddk.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/mmddk.h b/include/mmddk.h index d3593b0..f7e260f 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -380,6 +380,10 @@ typedef JOYDEVMSGPROC *LPJOYDEVMSGPROC; #define MCI_HPAL 11 #define MCI_HDC 12 +#ifdef _WIN64 +#define MCI_INTEGER64 13 +#endif /* _WIN64 */ + #define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes)) typedef struct {

1 0

Hans Leidekker : msi: Add stub implementations of MsiBeginTransaction and MsiEndTransaction.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 00327065649b6de9936b96b65d2d94842baaa86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00327065649b6de9936b96b65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 2 13:20:23 2010 +0200 msi: Add stub implementations of MsiBeginTransaction and MsiEndTransaction. --- dlls/msi/msi.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msi/msi.spec | 6 +++--- include/msi.h | 6 ++++++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index fb7eba5..7d1b9a5 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3779,3 +3779,44 @@ UINT WINAPI MsiInstallMissingComponentW(LPCWSTR szProduct, LPCWSTR szComponent, FIXME("(%s %s %d\n", debugstr_w(szProduct), debugstr_w(szComponent), eInstallState); return ERROR_SUCCESS; } + +/*********************************************************************** + * MsiBeginTransactionA [MSI.@] + */ +UINT WINAPI MsiBeginTransactionA( LPCSTR name, DWORD attrs, MSIHANDLE *id, HANDLE *event ) +{ + WCHAR *nameW; + UINT r; + + FIXME("%s %u %p %p\n", debugstr_a(name), attrs, id, event); + + nameW = strdupAtoW( name ); + if (name && !nameW) + return ERROR_OUTOFMEMORY; + + r = MsiBeginTransactionW( nameW, attrs, id, event ); + msi_free( nameW ); + return r; +} + +/*********************************************************************** + * MsiBeginTransactionW [MSI.@] + */ +UINT WINAPI MsiBeginTransactionW( LPCWSTR name, DWORD attrs, MSIHANDLE *id, HANDLE *event ) +{ + FIXME("%s %u %p %p\n", debugstr_w(name), attrs, id, event); + + *id = (MSIHANDLE)0xdeadbeef; + *event = (HANDLE)0xdeadbeef; + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * MsiEndTransaction [MSI.@] + */ +UINT WINAPI MsiEndTransaction( DWORD state ) +{ + FIXME("%u\n", state); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 6fdebd8..f0e3238 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -277,9 +277,9 @@ 281 stdcall MsiSetExternalUIRecord(ptr long ptr ptr) 282 stub MsiGetPatchFileListA 283 stub MsiGetPatchFileListW -284 stub MsiBeginTransactionA -285 stub MsiBeginTransactionW -286 stub MsiEndTransaction +284 stdcall MsiBeginTransactionA(str long ptr ptr) +285 stdcall MsiBeginTransactionW(wstr long ptr ptr) +286 stdcall MsiEndTransaction(long) 287 stub MsiJoinTransaction 288 stub MsiSetOfflineContextW 289 stub MsiEnumComponentsExA diff --git a/include/msi.h b/include/msi.h index b331057..164cd26 100644 --- a/include/msi.h +++ b/include/msi.h @@ -663,6 +663,12 @@ UINT WINAPI MsiApplyMultiplePatchesA(LPCSTR, LPCSTR, LPCSTR); UINT WINAPI MsiApplyMultiplePatchesW(LPCWSTR, LPCWSTR, LPCWSTR); #define MsiApplyMultiplePatches WINELIB_NAME_AW(MsiApplyMultiplePatches) +UINT WINAPI MsiBeginTransactionA(LPCSTR, DWORD, MSIHANDLE *, HANDLE *); +UINT WINAPI MsiBeginTransactionW(LPCWSTR, DWORD, MSIHANDLE *, HANDLE *); +#define MsiBeginTransaction WINELIB_NAME_AW(MsiBeginTransaction) + +UINT WINAPI MsiEndTransaction(DWORD); + /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void);

1 0