June 2015 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dmime: Use the generic DMObject implementation for DMGraph.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 060d8a463843387c45275feb86653c05f1f14d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=060d8a463843387c45275feb8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:22:26 2015 +0200 dmime: Use the generic DMObject implementation for DMGraph. --- dlls/dmime/graph.c | 178 +++++++++-------------------------------------- dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 32 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=060d8a463843387c45275…

1 0

Michael Stefaniuc : dmcompos/tests: Add IPersistStream tests for DM*Track.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: e8c778442b683bcc31f51d551a44eb6f14c27a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c778442b683bcc31f51d551… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:09:31 2015 +0200 dmcompos/tests: Add IPersistStream tests for DM*Track. --- dlls/dmcompos/tests/dmcompos.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index ca12229..c4cf386 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -261,6 +261,68 @@ static void test_chordmap(void) while (IDirectMusicChordMap_Release(dmcm)); } +static void test_chordmaptrack(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicChordMapTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack8, (void**)&dmt8); + ok(hr == S_OK, "DirectMusicChordMapTrack create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMapTrack), + "Expected class CLSID_DirectMusicChordMapTrack got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack8_Release(dmt8)); +} + +static void test_signposttrack(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSignPostTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack8, (void**)&dmt8); + ok(hr == S_OK, "DirectMusicSignPostTrack create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicSignPostTrack), + "Expected class CLSID_DirectMusicSignPostTrack got %s\n", wine_dbgstr_guid(&class)); + hr = IPersistStream_Save(ps, NULL, TRUE); + todo_wine ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + + while (IDirectMusicTrack8_Release(dmt8)); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -276,6 +338,8 @@ START_TEST(dmcompos) test_COM_template(); test_COM_track(); test_chordmap(); + test_chordmaptrack(); + test_signposttrack(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmband: Pass the object instead of the iface to helpers.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 6ac784ee827421e8ff19c8eb98447e9dd8243fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac784ee827421e8ff19c8eb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:04:41 2015 +0200 dmband: Pass the object instead of the iface to helpers. --- dlls/dmband/band.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 0ab7df7..bcb85d5 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -367,8 +367,9 @@ static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_IsDirty (LPPERSISTSTRE return S_FALSE; } -static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); +static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -418,7 +419,8 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR switch (Chunk.fccID) { case DMUS_FOURCC_REF_LIST: { FIXME_(dmfile)(": DMRF (DM References) list\n"); - hr = IDirectMusicUtils_IPersistStream_ParseReference (iface, &Chunk, pStm, &pObject); + hr = IDirectMusicUtils_IPersistStream_ParseReference((IPersistStream*)&This->PersistStreamVtbl, + &Chunk, pStm, &pObject); if (FAILED(hr)) { ERR(": could not load Reference\n"); return hr; @@ -471,8 +473,9 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR return S_OK; } -static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - /*ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface);*/ +static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -499,7 +502,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSI switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_LIST: { TRACE_(dmfile)(": Instrument list\n"); - hr = IDirectMusicBandImpl_IPersistStream_ParseInstrument (iface, &Chunk, pStm); + hr = parse_instrument(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -525,9 +528,9 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSI return S_OK; } -static HRESULT IDirectMusicBandImpl_IPersistStream_ParseBandForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); +static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -591,7 +594,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseBandForm (LPPERSISTSTREA } case DMUS_FOURCC_INSTRUMENTS_LIST: { TRACE_(dmfile)(": INSTRUMENTS list\n"); - hr = IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (iface, &Chunk, pStm); + hr = parse_instruments_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -636,7 +639,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_Load (LPPERSISTSTREAM switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { TRACE_(dmfile)(": Band form\n"); - hr = IDirectMusicBandImpl_IPersistStream_ParseBandForm (iface, &Chunk, pStm); + hr = parse_band_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Nikolay Sivov : dwrite: Fix the way drawing effects are reported for inline objects.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: b7fb00e9aa7b17c4fe9f90ac137b50a245528704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7fb00e9aa7b17c4fe9f90ac1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 01:15:25 2015 +0300 dwrite: Fix the way drawing effects are reported for inline objects. --- dlls/dwrite/layout.c | 136 ++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 237 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 320 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7fb00e9aa7b17c4fe9f9…

1 0

YongHao Hu : msvcp110: Add tr2_sys__Equivalent implementation and test.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 94e034245defa314b995ce96f4842ea3b04a3710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e034245defa314b995ce96f… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Jun 13 00:29:18 2015 +0800 msvcp110: Add tr2_sys__Equivalent implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/ios.c | 36 +++++++++++++++++++++++ 5 files changed, 100 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 5c48c76..c388eaf 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1196,8 +1196,8 @@ @ cdecl -arch=arm ?_Empty@?$_Yarn(a)_W@std@@QBA_NXZ(ptr) _Yarn_wchar__Empty @ thiscall -arch=i386 ?_Empty@?$_Yarn(a)_W@std@@QBE_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win64 ?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty -@ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z -@ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z +@ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Equivalent +@ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Equivalent @ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z @ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_char__Ffmt diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a6e60b1..c74e6ca 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1161,8 +1161,8 @@ @ cdecl -arch=arm ?_Empty@?$_Yarn(a)_W@std@@QBA_NXZ(ptr) _Yarn_wchar__Empty @ thiscall -arch=i386 ?_Empty@?$_Yarn(a)_W@std@@QBE_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win64 ?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty -@ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z -@ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z +@ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Equivalent +@ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Equivalent @ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z @ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_char__Ffmt diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 41e4c56..defa934 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -60,6 +60,7 @@ static void (CDECL *p__Do_call)(void *this); /* filesystem */ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); +static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -90,9 +91,13 @@ static BOOL init(void) if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z"); + SET(p_tr2_sys__Equivalent, + "?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); + SET(p_tr2_sys__Equivalent, + "?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z"); } msvcr = GetModuleHandleA("msvcr120.dll"); @@ -338,6 +343,58 @@ static void test_tr2_sys__File_size(void) ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); } +static void test_tr2_sys__Equivalent(void) +{ + int val, i; + HANDLE file; + char temp_path[MAX_PATH], current_path[MAX_PATH]; + struct { + char const *path1; + char const *path2; + int equivalent; + } tests[] = { + { NULL, NULL, -1 }, + { NULL, "f1", -1 }, + { "f1", NULL, -1 }, + { "f1", "tr2_test_dir", -1 }, + { "tr2_test_dir", "f1", -1 }, + { "tr2_test_dir", "tr2_test_dir", -1 }, + { "tr2_test_dir/./f1", "tr2_test_dir/f2", 0 }, + { "tr2_test_dir/f1" , "tr2_test_dir/f1", 1 }, + { "not_exists_file" , "tr2_test_dir/f1", 0 }, + { "tr2_test_dir\\f1" , "tr2_test_dir/./f1", 1 }, + { "not_exists_file" , "not_exists_file", -1 }, + { "tr2_test_dir/f1" , "not_exists_file", 0 }, + { "tr2_test_dir/../tr2_test_dir/f1", "tr2_test_dir/f1", 1 } + }; + + memset(current_path, 0, MAX_PATH); + GetCurrentDirectoryA(MAX_PATH, current_path); + memset(temp_path, 0, MAX_PATH); + GetTempPathA(MAX_PATH, temp_path); + ok(SetCurrentDirectoryA(temp_path), "SetCurrentDirectoryA to temp_path failed\n"); + CreateDirectoryA("tr2_test_dir", NULL); + + file = CreateFileA("tr2_test_dir/f1", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + file = CreateFileA("tr2_test_dir/f2", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + errno = 0xdeadbeef; + val = p_tr2_sys__Equivalent(tests[i].path1, tests[i].path2); + ok(tests[i].equivalent == val, "tr2_sys__Equivalent(): test %d expect: %d, got %d\n", i+1, tests[i].equivalent, val); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + } + + ok(DeleteFileA("tr2_test_dir/f1"), "Expected tr2_test_dir/f1 to exist\n"); + ok(DeleteFileA("tr2_test_dir/f2"), "Expected tr2_test_dir/f2 to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); + ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n"); +} + START_TEST(msvcp120) { if(!init()) return; @@ -348,5 +405,6 @@ START_TEST(msvcp120) test__Do_call(); test_tr2_sys__File_size(); + test_tr2_sys__Equivalent(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index e317987..fdbda65 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1161,8 +1161,8 @@ @ cdecl -arch=arm ?_Empty@?$_Yarn(a)_W@std@@QBA_NXZ(ptr) msvcp120.?_Empty@?$_Yarn(a)_W@std@@QBA_NXZ @ thiscall -arch=i386 ?_Empty@?$_Yarn(a)_W@std@@QBE_NXZ(ptr) msvcp120.?_Empty@?$_Yarn(a)_W@std@@QBE_NXZ @ cdecl -arch=win64 ?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ(ptr) msvcp120.?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ -@ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z -@ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z +@ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z +@ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z @ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z @ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7b8e226..d68e26a 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14205,6 +14205,42 @@ ULONGLONG __cdecl tr2_sys__File_size(const char* path) return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } +/* ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z */ +/* ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z */ +int __cdecl tr2_sys__Equivalent(char const* path1, char const* path2) +{ + HANDLE h1, h2; + int ret; + BY_HANDLE_FILE_INFORMATION info1, info2; + TRACE("(%p %p)\n", path1, path2); + + h1 = CreateFileA(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + h2 = CreateFileA(path2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + if(h1 == INVALID_HANDLE_VALUE) { + if(h2 == INVALID_HANDLE_VALUE) { + return -1; + }else { + CloseHandle(h2); + return 0; + } + }else if(h2 == INVALID_HANDLE_VALUE) { + CloseHandle(h1); + return 0; + } + + ret = GetFileInformationByHandle(h1, &info1) && GetFileInformationByHandle(h2, &info2); + CloseHandle(h1); + CloseHandle(h2); + if(!ret) + return -1; + return (info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber + && info1.nFileIndexHigh == info2.nFileIndexHigh + && info1.nFileIndexLow == info2.nFileIndexLow + ); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

YongHao Hu : msvcp110: Add tr2_sys__File_size implementation and test.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 62967318a536cfbdc0558ebcf12282e6ebc493a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62967318a536cfbdc0558ebcf… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Jun 13 00:28:39 2015 +0800 msvcp110: Add tr2_sys__File_size implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120/tests/msvcp120.c | 82 +++++++++++++++++++++++++++++++++---- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp90/ios.c | 15 +++++++ 5 files changed, 96 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 86eaa75..5c48c76 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1206,8 +1206,8 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt -@ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z -@ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z +@ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) tr2_sys__File_size +@ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) tr2_sys__File_size @ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z @ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z @ cdecl -arch=arm ?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index ef42168..a6e60b1 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1171,8 +1171,8 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt -@ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z -@ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z +@ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) tr2_sys__File_size +@ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) tr2_sys__File_size @ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z @ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z @ cdecl -arch=arm ?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 5db2fa0..41e4c56 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -17,6 +17,7 @@ */ #include <locale.h> +#include <stdio.h> #include "wine/test.h" #include "winbase.h" @@ -36,6 +37,16 @@ typedef struct { BYTE isleadbyte[32]; } _Cvtvec; +static inline const char* debugstr_longlong(ULONGLONG ll) +{ + static char string[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(string, "%lx", (unsigned long)ll); + return string; +} + static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__setmbcp)(int); static int (__cdecl *p_isleadbyte)(int); @@ -47,8 +58,12 @@ static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); static void (CDECL *p__Do_call)(void *this); -static HMODULE msvcp; +/* filesystem */ +static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); +static HMODULE msvcp; +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { HANDLE msvcr; @@ -60,12 +75,25 @@ static BOOL init(void) return FALSE; } - p__Xtime_diff_to_millis2 = (void*)GetProcAddress(msvcp, "_Xtime_diff_to_millis2"); - p_xtime_get = (void*)GetProcAddress(msvcp, "xtime_get"); - p__Getcvt = (void*)GetProcAddress(msvcp, "_Getcvt"); - p__Call_once = (void*)GetProcAddress(msvcp, "_Call_once"); - p__Call_onceEx = (void*)GetProcAddress(msvcp, "_Call_onceEx"); - p__Do_call = (void*)GetProcAddress(msvcp, "_Do_call"); + SET(p__Xtime_diff_to_millis2, + "_Xtime_diff_to_millis2"); + SET(p_xtime_get, + "xtime_get"); + SET(p__Getcvt, + "_Getcvt"); + SET(p__Call_once, + "_Call_once"); + SET(p__Call_onceEx, + "_Call_onceEx"); + SET(p__Do_call, + "_Do_call"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p_tr2_sys__File_size, + "?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z"); + } else { + SET(p_tr2_sys__File_size, + "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); + } msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -271,6 +299,45 @@ static void test__Do_call(void) ok(cnt == 1, "func was not called\n"); } +static void test_tr2_sys__File_size(void) +{ + ULONGLONG val; + HANDLE file; + LARGE_INTEGER file_size = {{7, 0}}; + CreateDirectoryA("tr2_test_dir", NULL); + + file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + val = p_tr2_sys__File_size("tr2_test_dir/f1"); + ok(val == 7, "file_size is %s\n", debugstr_longlong(val)); + + file = CreateFileA("tr2_test_dir/f2", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + val = p_tr2_sys__File_size("tr2_test_dir/f2"); + ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); + + val = p_tr2_sys__File_size("tr2_test_dir"); + ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); + + errno = 0xdeadbeef; + val = p_tr2_sys__File_size("tr2_test_dir/not_exists_file"); + ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + val = p_tr2_sys__File_size(NULL); + ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(DeleteFileA("tr2_test_dir/f1"), "Expected tr2_test_dir/f1 to exist\n"); + ok(DeleteFileA("tr2_test_dir/f2"), "Expected tr2_test_dir/f2 to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); +} + START_TEST(msvcp120) { if(!init()) return; @@ -280,5 +347,6 @@ START_TEST(msvcp120) test__Call_once(); test__Do_call(); + test_tr2_sys__File_size(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 2c409b1..e317987 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1171,8 +1171,8 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBAPEADPEADDH(a)Z @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABAPADPADDH(a)Z @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z -@ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z -@ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z +@ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z +@ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z @ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z @ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z @ cdecl -arch=arm ?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z(ptr long) msvcp120.?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a15bed6..7b8e226 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14190,6 +14190,21 @@ basic_ostream_char* __cdecl basic_ostream_char_print_complex_ldouble(basic_ostre return ostr; } +/* ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z */ +/* ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z */ +ULONGLONG __cdecl tr2_sys__File_size(const char* path) +{ + WIN32_FILE_ATTRIBUTE_DATA fad; + + TRACE("(%p)\n", path); + if(!GetFileAttributesExA(path, GetFileExInfoStandard, &fad)) + return 0; + if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + return 0; + + return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Nikolay Sivov : ole32: Marshal HICON as remotable handle.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 6d53f071c6b83375a34c373c84d764c04289852b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d53f071c6b83375a34c373c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 11:12:42 2015 +0300 ole32: Marshal HICON as remotable handle. --- dlls/ole32/tests/usrmarshal.c | 36 +++++++++++++++ dlls/ole32/usrmarshal.c | 100 +----------------------------------------- include/objidl.idl | 10 +++++ 3 files changed, 47 insertions(+), 99 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 53cd9fe..6f90c53 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -897,6 +897,41 @@ static void test_marshal_HDC(void) ReleaseDC(0, hdc); } +static void test_marshal_HICON(void) +{ + static const BYTE bmp_bits[1024]; + MIDL_STUB_MESSAGE stub_msg; + HICON hIcon, hIcon2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + wireHICON wirehicon; + ULONG size; + + hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, bmp_bits); + ok(hIcon != 0, "CreateIcon failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HICON_UserSize(&umcb.Flags, 0, &hIcon); + ok(size == sizeof(*wirehicon), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HICON_UserMarshal(&umcb.Flags, buffer, &hIcon); + wirehicon = (wireHICON)buffer; + ok(wirehicon->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehicon->fContext); + ok(wirehicon->u.hInproc == (LONG_PTR)hIcon, "Marshaled value should be %p instead of %x\n", hIcon, wirehicon->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HICON_UserUnmarshal(&umcb.Flags, buffer, &hIcon2); + ok(hIcon == hIcon2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HICON_UserFree(&umcb.Flags, &hIcon2); + DestroyIcon(hIcon); +} + START_TEST(usrmarshal) { CoInitialize(NULL); @@ -911,6 +946,7 @@ START_TEST(usrmarshal) test_marshal_STGMEDIUM(); test_marshal_SNB(); test_marshal_HDC(); + test_marshal_HICON(); CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 8f895f8..89f4f4a 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -342,6 +342,7 @@ IMPL_WIREM_HANDLE(HACCEL) IMPL_WIREM_HANDLE(HMENU) IMPL_WIREM_HANDLE(HWND) IMPL_WIREM_HANDLE(HDC) +IMPL_WIREM_HANDLE(HICON) /****************************************************************************** * HGLOBAL_UserSize [OLE32.@] @@ -662,105 +663,6 @@ void __RPC_USER HBITMAP_UserFree(ULONG *pFlags, HBITMAP *phBmp) } /****************************************************************************** - * HICON_UserSize [OLE32.@] - * - * Calculates the buffer size required to marshal an icon. - * - * PARAMS - * pFlags [I] Flags. See notes. - * StartingSize [I] Starting size of the buffer. This value is added on to - * the buffer size required for the icon. - * phIcon [I] Icon to size. - * - * RETURNS - * The buffer size required to marshal an icon plus the starting size. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -ULONG __RPC_USER HICON_UserSize(ULONG *pFlags, ULONG StartingSize, HICON *phIcon) -{ - FIXME(":stub\n"); - return StartingSize; -} - -/****************************************************************************** -* HICON_UserMarshal [OLE32.@] -* -* Marshals an icon into a buffer. -* -* PARAMS -* pFlags [I] Flags. See notes. -* pBuffer [I] Buffer to marshal the icon into. -* phIcon [I] Icon to marshal. -* -* RETURNS -* The end of the marshaled data in the buffer. -* -* NOTES -* Even though the function is documented to take a pointer to a ULONG in -* pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which -* the first parameter is a ULONG. -* This function is only intended to be called by the RPC runtime. -*/ -unsigned char * __RPC_USER HICON_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HICON *phIcon) -{ - FIXME(":stub\n"); - return pBuffer; -} - -/****************************************************************************** - * HICON_UserUnmarshal [OLE32.@] - * - * Unmarshals an icon from a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the icon from. - * phIcon [O] Address that receive the unmarshaled icon. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to an ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is an ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HICON_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HICON *phIcon) -{ - FIXME(":stub\n"); - return pBuffer; -} - -/****************************************************************************** - * HICON_UserFree [OLE32.@] - * - * Frees an unmarshaled icon. - * - * PARAMS - * pFlags [I] Flags. See notes. - * phIcon [I] Icon to free. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of - * which the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -void __RPC_USER HICON_UserFree(ULONG *pFlags, HICON *phIcon) -{ - FIXME(":stub\n"); -} - -/****************************************************************************** * HPALETTE_UserSize [OLE32.@] * * Calculates the buffer size required to marshal a palette. diff --git a/include/objidl.idl b/include/objidl.idl index ecae70e..c18442f 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2441,6 +2441,16 @@ interface IGlobalOptions : IUnknown HRESULT Query([in] GLOBALOPT_PROPERTIES property, [out ] ULONG_PTR *value); } +[ + object, + pointer_default(unique), + uuid(947990de-cc28-11d2-a0f7-00805f858fb1) +] +interface IDummyHICONIncluder : IUnknown +{ + HRESULT Dummy([in] HICON hIcon, [in] HDC hdc); +} + cpp_quote("#ifdef USE_COM_CONTEXT_DEF") typedef DWORD CPFLAGS;

1 0

Nikolay Sivov : ole32: Marshal HDC as remotable handle.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 815197f28caa9683838a97621680b1411122cb35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815197f28caa9683838a97621… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 11:10:33 2015 +0300 ole32: Marshal HDC as remotable handle. --- dlls/ole32/tests/usrmarshal.c | 32 ++++++++++++++ dlls/ole32/usrmarshal.c | 100 +----------------------------------------- 2 files changed, 33 insertions(+), 99 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 83dedc7..53cd9fe 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -866,6 +866,37 @@ static void test_marshal_SNB(void) g_expect_user_free = FALSE; } +static void test_marshal_HDC(void) +{ + MIDL_STUB_MESSAGE stub_msg; + HDC hdc = GetDC(0), hdc2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + wireHDC wirehdc; + ULONG size; + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HDC_UserSize(&umcb.Flags, 0, &hdc); + ok(size == sizeof(*wirehdc), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HDC_UserMarshal(&umcb.Flags, buffer, &hdc); + wirehdc = (wireHDC)buffer; + ok(wirehdc->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehdc->fContext); + ok(wirehdc->u.hInproc == (LONG_PTR)hdc, "Marshaled value should be %p instead of %x\n", hdc, wirehdc->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HDC_UserUnmarshal(&umcb.Flags, buffer, &hdc2); + ok(hdc == hdc2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HDC_UserFree(&umcb.Flags, &hdc2); + ReleaseDC(0, hdc); +} + START_TEST(usrmarshal) { CoInitialize(NULL); @@ -879,6 +910,7 @@ START_TEST(usrmarshal) test_marshal_WdtpInterfacePointer(); test_marshal_STGMEDIUM(); test_marshal_SNB(); + test_marshal_HDC(); CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index d22f9f7..8f895f8 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -341,6 +341,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *phMenu) IMPL_WIREM_HANDLE(HACCEL) IMPL_WIREM_HANDLE(HMENU) IMPL_WIREM_HANDLE(HWND) +IMPL_WIREM_HANDLE(HDC) /****************************************************************************** * HGLOBAL_UserSize [OLE32.@] @@ -760,105 +761,6 @@ void __RPC_USER HICON_UserFree(ULONG *pFlags, HICON *phIcon) } /****************************************************************************** - * HDC_UserSize [OLE32.@] - * - * Calculates the buffer size required to marshal an HDC. - * - * PARAMS - * pFlags [I] Flags. See notes. - * StartingSize [I] Starting size of the buffer. This value is added on to - * the buffer size required for the clip format. - * phGlobal [I] HDC to size. - * - * RETURNS - * The buffer size required to marshal an HDC plus the starting size. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -ULONG __RPC_USER HDC_UserSize(ULONG *pFlags, ULONG StartingSize, HDC *phdc) -{ - FIXME(":stub\n"); - return StartingSize; -} - -/****************************************************************************** - * HDC_UserMarshal [OLE32.@] - * - * Marshals an HDC into a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format into. - * phdc [I] HDC to marshal. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HDC_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HDC *phdc) -{ - FIXME(":stub\n"); - return pBuffer; -} - -/****************************************************************************** - * HDC_UserUnmarshal [OLE32.@] - * - * Unmarshals an HDC from a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format from. - * phdc [O] Address that receive the unmarshaled HDC. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to an ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is an ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HDC_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HDC *phdc) -{ - FIXME(":stub\n"); - return pBuffer; -} - -/****************************************************************************** - * HDC_UserFree [OLE32.@] - * - * Frees an unmarshaled HDC. - * - * PARAMS - * pFlags [I] Flags. See notes. - * phdc [I] HDC to free. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of - * which the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -void __RPC_USER HDC_UserFree(ULONG *pFlags, HDC *phdc) -{ - FIXME(":stub\n"); -} - -/****************************************************************************** * HPALETTE_UserSize [OLE32.@] * * Calculates the buffer size required to marshal a palette.

1 0

Dmitry Timoshkov : gdiplus: Implement GdipCreateRegionRgnData.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: a66d664505de9a79f7f4f07b93c97a3d21ec3c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66d664505de9a79f7f4f07b9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Jun 13 10:53:58 2015 +0300 gdiplus: Implement GdipCreateRegionRgnData. --- dlls/gdiplus/region.c | 249 ++++++++++++++++++++++++++++++++++++-------- dlls/gdiplus/tests/region.c | 65 ++++++++++++ 2 files changed, 273 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a66d664505de9a79f7f4f…

1 0

Michael Stefaniuc : dmime: Use the generic DirectMusicObject implementation for DMSegment.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 5ba420b63520d8767925da969d22bfe10c770e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba420b63520d8767925da969… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:18:57 2015 +0200 dmime: Use the generic DirectMusicObject implementation for DMSegment. --- dlls/dmime/Makefile.in | 1 + dlls/dmime/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/dmobject.h | 55 +++++++++++++++ dlls/dmime/segment.c | 170 ++++++++++----------------------------------- 4 files changed, 279 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ba420b63520d8767925d…

1 0