December 2009 - Wine-commits

Vincent Povirk : ole32: Add some tests for IEnumSTATSTG.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 2010e0fb28cad8c8cba57869926558d408ea3c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2010e0fb28cad8c8cba578699… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 18:36:23 2009 -0600 ole32: Add some tests for IEnumSTATSTG. --- dlls/ole32/tests/storage32.c | 152 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 148 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 12f2504..766c83c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -845,6 +845,8 @@ static void test_streamenum(void) HRESULT r; IStream *stm = NULL; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'A','B','C','D','E','F','G','H','I',0 }; + static const WCHAR stmname3[] = { 'A','B','C','D','E','F','G','H','I','J',0 }; STATSTG stat; IEnumSTATSTG *ee = NULL; ULONG count; @@ -887,7 +889,7 @@ static void test_streamenum(void) ok(r==S_OK, "IStorage->EnumElements failed\n"); r = IStorage_DestroyElement(stg, stmname); - ok(r==S_OK, "IStorage->EnumElements failed\n"); + ok(r==S_OK, "IStorage->DestroyElement failed\n"); todo_wine { count = 0xf00; @@ -905,11 +907,104 @@ static void test_streamenum(void) ok(r==S_FALSE, "IEnumSTATSTG->Next failed\n"); ok(count == 0, "count wrong\n"); - r = IEnumSTATSTG_Release(ee); - ok (r == 0, "enum not released\n"); + /* add a stream before reading */ + r = IEnumSTATSTG_Reset(ee); + ok(r==S_OK, "IEnumSTATSTG->Reset failed\n"); + + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Release(stm); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + todo_wine ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + todo_wine ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + ok(lstrcmpiW(stat.pwcsName, stmname) == 0, "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } + + r = IStorage_CreateStream(stg, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Release(stm); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + todo_wine ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + todo_wine ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + ok(lstrcmpiW(stat.pwcsName, stmname2) == 0, "expected ABCDEFGHI, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } + + /* delete previous and next stream after reading */ + r = IStorage_CreateStream(stg, stmname3, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Release(stm); + + r = IEnumSTATSTG_Reset(ee); + ok(r==S_OK, "IEnumSTATSTG->Reset failed\n"); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + ok(lstrcmpiW(stat.pwcsName, stmname) == 0, "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } + + r = IStorage_DestroyElement(stg, stmname); + ok(r==S_OK, "IStorage->DestroyElement failed\n"); + + r = IStorage_DestroyElement(stg, stmname2); + ok(r==S_OK, "IStorage->DestroyElement failed\n"); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + todo_wine ok(lstrcmpiW(stat.pwcsName, stmname3) == 0, "expected ABCDEFGHIJ, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } r = IStorage_Release( stg ); - ok (r == 0, "storage not released\n"); + todo_wine ok (r == 0, "storage not released\n"); + + /* enumerator is still valid and working after the storage is released */ + r = IEnumSTATSTG_Reset(ee); + ok(r==S_OK, "IEnumSTATSTG->Reset failed\n"); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + ok(lstrcmpiW(stat.pwcsName, stmname3) == 0, "expected ABCDEFGHIJ, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } + + /* the storage is left open until the enumerator is freed */ + r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, NULL, 0, &stg); + ok(r==STG_E_SHAREVIOLATION, "StgCreateDocfile failed, res=%x\n", r); + + r = IEnumSTATSTG_Release(ee); + ok (r == 0, "enum not released\n"); DeleteFileA(filenameA); } @@ -2564,6 +2659,54 @@ static void test_toplevel_stat(void) DeleteFileA(filenameA); } +static void test_substorage_enum(void) +{ + IStorage *stg, *stg2; + IEnumSTATSTG *ee; + HRESULT r; + ULONG ref; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* create an enumelements */ + r = IStorage_EnumElements(stg2, 0, NULL, 0, &ee); + ok(r==S_OK, "IStorage->EnumElements failed, hr=%08x\n", r); + + /* release the substorage */ + ref = IStorage_Release(stg2); + todo_wine ok(ref==0, "storage not released\n"); + + /* reopening fails, because the substorage is really still open */ + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage failed, hr=%08x\n", r); + + /* destroying the storage invalidates the enumerator */ + r = IStorage_DestroyElement(stg, stgname); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + +if (0) { /* crashes on wine */ + r = IEnumSTATSTG_Reset(ee); + ok(r==STG_E_REVERTED, "IEnumSTATSTG->Reset failed, hr=%08x\n", r); +} + + IEnumSTATSTG_Release(ee); + + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2602,4 +2745,5 @@ START_TEST(storage32) test_copyto_iidexclusions_stream(); test_rename(); test_toplevel_stat(); + test_substorage_enum(); }

1 0

Vincent Povirk : ole32: Make IEnumSTATSTG functions fail when the parent is invalid.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 44928502007fe624998ee1d206c8ce7cf20b9ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44928502007fe624998ee1d20… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 19:16:02 2009 -0600 ole32: Make IEnumSTATSTG functions fail when the parent is invalid. --- dlls/ole32/storage32.c | 12 ++++++++++++ dlls/ole32/tests/storage32.c | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 7d267b6..e21acf1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4513,6 +4513,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( if ( (rgelt==0) || ( (celt!=1) && (pceltFetched==0) ) ) return E_INVALIDARG; + if (This->parentStorage->reverted) + return STG_E_REVERTED; + /* * To avoid the special case, get another pointer to a ULONG value if * the caller didn't supply one. @@ -4588,6 +4591,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( ULONG objectFetched = 0; DirRef currentSearchNode; + if (This->parentStorage->reverted) + return STG_E_REVERTED; + /* * Start with the node at the top of the stack. */ @@ -4638,6 +4644,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset( DirEntry storageEntry; HRESULT hr; + if (This->parentStorage->reverted) + return STG_E_REVERTED; + /* * Re-initialize the search stack to an empty stack */ @@ -4672,6 +4681,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( IEnumSTATSTGImpl* newClone; + if (This->parentStorage->reverted) + return STG_E_REVERTED; + /* * Perform a sanity check on the parameters. */ diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 766c83c..f8a6134 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2694,10 +2694,8 @@ static void test_substorage_enum(void) r = IStorage_DestroyElement(stg, stgname); ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); -if (0) { /* crashes on wine */ r = IEnumSTATSTG_Reset(ee); ok(r==STG_E_REVERTED, "IEnumSTATSTG->Reset failed, hr=%08x\n", r); -} IEnumSTATSTG_Release(ee);

1 0

Vincent Povirk : ole32: Store the most recent item name in IEnumSTATSTG instead of a stack.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: fc50ff07d63af54fe96ce08d9da58f4e63f551f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc50ff07d63af54fe96ce08d9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 19:45:36 2009 -0600 ole32: Store the most recent item name in IEnumSTATSTG instead of a stack. --- dlls/ole32/storage32.c | 246 +++++++++++------------------------------ dlls/ole32/tests/storage32.c | 12 +-- 2 files changed, 71 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc50ff07d63af54fe96ce…

1 0

Vincent Povirk : ole32: Reread the stream entry after setting the size in StreamWriteAt.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: b3511ebb70072d8615d09db638e47e9f3d86fcfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3511ebb70072d8615d09db63… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 19 14:20:02 2009 -0600 ole32: Reread the stream entry after setting the size in StreamWriteAt. In simple mode, StreamWriteAt would assume that StreamSetSize uses the size it asks for, but in some cases the size would be pushed above the small block limit. StreamWriteAt would then attempt to write using a small block chain, even though a big block chain was created. --- dlls/ole32/storage32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ef71e6f..629709a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2475,7 +2475,8 @@ static HRESULT StorageImpl_StreamWriteAt(StorageBaseImpl *base, DirRef index, if (FAILED(hr)) return hr; - data.size = newSize; + hr = StorageImpl_ReadDirEntry(This, index, &data); + if (FAILED(hr)) return hr; } if (data.size.QuadPart < LIMIT_TO_USE_SMALL_BLOCK)

1 0

Hans Leidekker : secur32/tests: Fix a couple of memory leaks.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 44f9595454e022c82bc5e467b1cd952a2a4d2b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f9595454e022c82bc5e467b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Dec 19 22:29:52 2009 +0100 secur32/tests: Fix a couple of memory leaks. Found by Valgrind. --- dlls/secur32/tests/ntlm.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index db00d73..d9f9538 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -775,6 +775,8 @@ static void testInitializeSecurityContextFlags(void) tISCFend: cleanupBuffers(&client); pFreeCredentialsHandle(client.cred); + HeapFree(GetProcessHeap(), 0, client.cred); + HeapFree(GetProcessHeap(), 0, client.ctxt); } @@ -911,6 +913,11 @@ tAuthend: sec_status = pFreeCredentialsHandle(client.cred); ok(sec_status == SEC_E_OK, "FreeCredentialsHandle(client) returned %s\n", getSecError(sec_status)); + + HeapFree(GetProcessHeap(), 0, client.cred); + HeapFree(GetProcessHeap(), 0, client.ctxt); + HeapFree(GetProcessHeap(), 0, server.cred); + HeapFree(GetProcessHeap(), 0, server.ctxt); } static void testSignSeal(void) @@ -1186,6 +1193,8 @@ end: HeapFree(GetProcessHeap(), 0, data[1].pvBuffer); HeapFree(GetProcessHeap(), 0, complex_data[1].pvBuffer); HeapFree(GetProcessHeap(), 0, complex_data[3].pvBuffer); + HeapFree(GetProcessHeap(), 0, server.cred); + HeapFree(GetProcessHeap(), 0, server.ctxt); } static void testAcquireCredentialsHandle(void) @@ -1317,6 +1326,8 @@ static void test_cred_multiple_use(void) ok(ret == SEC_E_OK, "DeleteSecurityContext failed with error 0x%x\n", ret); ret = pFreeCredentialsHandle(&cred); ok(ret == SEC_E_OK, "FreeCredentialsHandle failed with error 0x%x\n", ret); + + HeapFree(GetProcessHeap(), 0, buffers[0].pvBuffer); } static void test_null_auth_data(void) @@ -1358,6 +1369,8 @@ static void test_null_auth_data(void) ISC_REQ_CONNECTION, 0, SECURITY_NETWORK_DREP, NULL, 0, &ctx, &buffer_desc, &attr, &ttl); ok(status == SEC_I_CONTINUE_NEEDED, "InitializeSecurityContextA failed %s\n", getSecError(status)); + + HeapFree(GetProcessHeap(), 0, buffers[0].pvBuffer); } START_TEST(ntlm)

1 0

Alexandre Julliard : setupx: Pass 0 as instance to InstallHinfSectionA.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: ff0d84d4a3c87e7ca99d7d75c5a63eb12b7684da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0d84d4a3c87e7ca99d7d75c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:19:33 2009 +0100 setupx: Pass 0 as instance to InstallHinfSectionA. --- dlls/setupx.dll16/setupx_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index de3a397..3c37e1e 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -70,8 +70,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); -#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) - /*********************************************************************** * SURegOpenKey (SETUPX.47) */ @@ -126,7 +124,7 @@ DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 ) */ RETERR16 WINAPI InstallHinfSection16( HWND16 hwnd, HINSTANCE16 hinst, LPCSTR lpszCmdLine, INT16 nCmdShow) { - InstallHinfSectionA( HWND_32(hwnd), HINSTANCE_32(hinst), lpszCmdLine, nCmdShow ); + InstallHinfSectionA( HWND_32(hwnd), 0, lpszCmdLine, nCmdShow ); return OK; }

1 0

Alexandre Julliard : shell32: Use the module instance instead of that of the owner window for the about dialog .
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 29c0ecfd1ccaf831f39f12a6d6630ac94f1eca75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c0ecfd1ccaf831f39f12a6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:20:04 2009 +0100 shell32: Use the module instance instead of that of the owner window for the about dialog. --- dlls/shell32/shell32_main.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 91795b9..2d0f0b7 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1043,18 +1043,12 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, { ABOUT_INFO info; LOGFONTW logFont; - HRSRC hRes; - LPVOID template; BOOL bRet; static const WCHAR wszSHELL_ABOUT_MSGBOX[] = {'S','H','E','L','L','_','A','B','O','U','T','_','M','S','G','B','O','X',0}; TRACE("\n"); - if(!(hRes = FindResourceW(shell32_hInstance, wszSHELL_ABOUT_MSGBOX, (LPWSTR)RT_DIALOG))) - return FALSE; - if(!(template = LoadResource(shell32_hInstance, hRes))) - return FALSE; if (!hIcon) hIcon = LoadImageW( 0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, 48, 48, LR_SHARED ); info.szApp = szApp; info.szOtherStuff = szOtherStuff; @@ -1063,8 +1057,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 ); info.hFont = CreateFontIndirectW( &logFont ); - bRet = DialogBoxIndirectParamW((HINSTANCE)GetWindowLongPtrW( hWnd, GWLP_HINSTANCE ), - template, hWnd, AboutDlgProc, (LPARAM)&info ); + bRet = DialogBoxParamW( shell32_hInstance, wszSHELL_ABOUT_MSGBOX, hWnd, AboutDlgProc, (LPARAM)&info ); DeleteObject(info.hFont); return bRet; }

1 0

Alexandre Julliard : comctl32: Use the module instance instead of that of the owner window for the toolbar configuration dialog .
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 6fd93a6c7e3ca9af51dcc0e161f9d5c9167feb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd93a6c7e3ca9af51dcc0e16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:20:19 2009 +0100 comctl32: Use the module instance instead of that of the owner window for the toolbar configuration dialog. --- dlls/comctl32/toolbar.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1cbdd6f..d5ca524 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3156,8 +3156,6 @@ TOOLBAR_Customize (TOOLBAR_INFO *infoPtr) { CUSTDLG_INFO custInfo; LRESULT ret; - LPCVOID template; - HRSRC hRes; NMHDR nmhdr; custInfo.tbInfo = infoPtr; @@ -3166,17 +3164,8 @@ TOOLBAR_Customize (TOOLBAR_INFO *infoPtr) /* send TBN_BEGINADJUST notification */ TOOLBAR_SendNotify (&nmhdr, infoPtr, TBN_BEGINADJUST); - if (!(hRes = FindResourceW (COMCTL32_hModule, - MAKEINTRESOURCEW(IDD_TBCUSTOMIZE), - (LPWSTR)RT_DIALOG))) - return FALSE; - - if(!(template = LoadResource (COMCTL32_hModule, hRes))) - return FALSE; - - ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE), - template, infoPtr->hwndSelf, TOOLBAR_CustomizeDialogProc, - (LPARAM)&custInfo); + ret = DialogBoxParamW (COMCTL32_hModule, MAKEINTRESOURCEW(IDD_TBCUSTOMIZE), + infoPtr->hwndSelf, TOOLBAR_CustomizeDialogProc, (LPARAM)&custInfo); /* send TBN_ENDADJUST notification */ TOOLBAR_SendNotify (&nmhdr, infoPtr, TBN_ENDADJUST);

1 0

Alexandre Julliard : user32: Send all CreateWindow calls through the WoW wrapper to allow mapping 16-bit instances .
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: ce50559013365073dd76ef1169fe42cd91bc2e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce50559013365073dd76ef116… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:21:48 2009 +0100 user32: Send all CreateWindow calls through the WoW wrapper to allow mapping 16-bit instances. --- dlls/user32/controls.h | 3 ++ dlls/user32/msg16.c | 81 ++++++++--------------------------------------- dlls/user32/win.c | 6 ++-- dlls/user32/winproc.c | 1 + dlls/user32/wnd16.c | 60 +++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 70 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 3bde456..956c32e 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -96,6 +96,7 @@ struct wow_handlers16 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); }; @@ -123,6 +124,8 @@ extern LRESULT MDIClientWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HI extern LRESULT ScrollBarWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; +/* 16-bit support */ +extern HWND create_window16(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT) DECLSPEC_HIDDEN; extern void register_wow_handlers(void) DECLSPEC_HIDDEN; extern void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wow_handlers32 *orig ); diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index c3365e8..db6de66 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -2000,73 +2000,6 @@ BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg ) /*********************************************************************** - * CreateWindowEx (USER.452) - */ -HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, - LPCSTR windowName, DWORD style, INT16 x, - INT16 y, INT16 width, INT16 height, - HWND16 parent, HMENU16 menu, - HINSTANCE16 instance, LPVOID data ) -{ - CREATESTRUCTA cs; - char buffer[256]; - HWND hwnd; - - /* Fix the coordinates */ - - cs.x = (x == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)x; - cs.y = (y == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)y; - cs.cx = (width == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)width; - cs.cy = (height == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)height; - - /* Create the window */ - - cs.lpCreateParams = data; - cs.hInstance = HINSTANCE_32(instance); - cs.hMenu = HMENU_32(menu); - cs.hwndParent = WIN_Handle32( parent ); - cs.style = style; - cs.lpszName = windowName; - cs.lpszClass = className; - cs.dwExStyle = exStyle; - - /* map to module handle */ - if (instance) instance = GetExePtr( instance ); - - /* load the menu */ - if (!menu && (style & (WS_CHILD | WS_POPUP)) != WS_CHILD) - { - WNDCLASSA class; - - if (GetClassInfoA( HINSTANCE_32(instance), className, &class )) - cs.hMenu = HMENU_32( LoadMenu16( instance, class.lpszMenuName )); - } - - if (!IS_INTRESOURCE(className)) - { - WCHAR bufferW[256]; - - if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) - return 0; - hwnd = wow_handlers32.create_window( (CREATESTRUCTW *)&cs, bufferW, - HINSTANCE_32(instance), 0 ); - } - else - { - if (!GlobalGetAtomNameA( LOWORD(className), buffer, sizeof(buffer) )) - { - ERR( "bad atom %x\n", LOWORD(className)); - return 0; - } - cs.lpszClass = buffer; - hwnd = wow_handlers32.create_window( (CREATESTRUCTW *)&cs, (LPCWSTR)className, - HINSTANCE_32(instance), 0 ); - } - return HWND_16( hwnd ); -} - - -/*********************************************************************** * button_proc16 */ static LRESULT button_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) @@ -2642,6 +2575,19 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, } +/*********************************************************************** + * create_window16 + */ +HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, UINT flags ) +{ + /* map to module handle */ + if (instance && !((ULONG_PTR)instance >> 16)) + instance = HINSTANCE_32( GetExePtr( HINSTANCE_16(instance) )); + + return wow_handlers32.create_window( cs, className, instance, flags ); +} + + void register_wow_handlers(void) { static const struct wow_handlers16 handlers16 = @@ -2653,6 +2599,7 @@ void register_wow_handlers(void) mdiclient_proc16, scrollbar_proc16, static_proc16, + create_window16, call_window_proc_Ato16, call_dialog_proc_Ato16 }; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7834501..393c562 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1465,11 +1465,11 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, WCHAR bufferW[256]; if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) return 0; - return WIN_CreateWindowEx( (CREATESTRUCTW *)&cs, bufferW, instance, WIN_ISWIN32 ); + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, bufferW, instance, WIN_ISWIN32 ); } /* Note: we rely on the fact that CREATESTRUCTA and */ /* CREATESTRUCTW have the same layout. */ - return WIN_CreateWindowEx( (CREATESTRUCTW *)&cs, (LPCWSTR)className, instance, WIN_ISWIN32 ); + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, (LPCWSTR)className, instance, WIN_ISWIN32 ); } @@ -1497,7 +1497,7 @@ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, cs.lpszClass = className; cs.dwExStyle = exStyle; - return WIN_CreateWindowEx( &cs, className, instance, WIN_ISWIN32 | WIN_ISUNICODE ); + return wow_handlers.create_window( &cs, className, instance, WIN_ISWIN32 | WIN_ISUNICODE ); } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 36f8279..48a9dbe 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1152,6 +1152,7 @@ struct wow_handlers16 wow_handlers = MDIClientWndProc_common, ScrollBarWndProc_common, StaticWndProc_common, + WIN_CreateWindowEx, NULL, /* call_window_proc */ NULL /* call_dialog_proc */ }; diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 4873be7..ad99e6d 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -21,6 +21,7 @@ #include "wine/winuser16.h" #include "wownt32.h" #include "win.h" +#include "controls.h" #include "user_private.h" #include "wine/server.h" @@ -1789,6 +1790,65 @@ BOOL16 WINAPI DrawAnimatedRects16( HWND16 hwnd, INT16 idAni, /*********************************************************************** + * CreateWindowEx (USER.452) + */ +HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, + LPCSTR windowName, DWORD style, INT16 x, + INT16 y, INT16 width, INT16 height, + HWND16 parent, HMENU16 menu, + HINSTANCE16 instance, LPVOID data ) +{ + CREATESTRUCTA cs; + char buffer[256]; + HWND hwnd; + + /* Fix the coordinates */ + + cs.x = (x == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)x; + cs.y = (y == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)y; + cs.cx = (width == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)width; + cs.cy = (height == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)height; + + /* Create the window */ + + cs.lpCreateParams = data; + cs.hInstance = HINSTANCE_32(instance); + cs.hMenu = HMENU_32(menu); + cs.hwndParent = WIN_Handle32( parent ); + cs.style = style; + cs.lpszName = windowName; + cs.lpszClass = className; + cs.dwExStyle = exStyle; + + /* load the menu */ + if (!menu && (style & (WS_CHILD | WS_POPUP)) != WS_CHILD) + { + WNDCLASSA class; + HINSTANCE16 module = GetExePtr( instance ); + + if (GetClassInfoA( HINSTANCE_32(module), className, &class )) + cs.hMenu = HMENU_32( LoadMenu16( module, class.lpszMenuName )); + } + + if (!IS_INTRESOURCE(className)) + { + WCHAR bufferW[256]; + + if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) + return 0; + hwnd = create_window16( (CREATESTRUCTW *)&cs, bufferW, HINSTANCE_32(instance), 0 ); + } + else + { + if (!GlobalGetAtomNameA( LOWORD(className), buffer, sizeof(buffer) )) return 0; + cs.lpszClass = buffer; + hwnd = create_window16( (CREATESTRUCTW *)&cs, (LPCWSTR)className, HINSTANCE_32(instance), 0 ); + } + return HWND_16( hwnd ); +} + + +/*********************************************************************** * GetInternalWindowPos (USER.460) */ UINT16 WINAPI GetInternalWindowPos16( HWND16 hwnd, LPRECT16 rectWnd, LPPOINT16 ptIcon )

1 0

Alexandre Julliard : user32: Support calling a 32-bit procedure even without a corresponding thunk in CallWindowProc16 .
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: cb060d644938ff54805f7de6773314f0a974bc4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb060d644938ff54805f7de67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 15:01:02 2009 +0100 user32: Support calling a 32-bit procedure even without a corresponding thunk in CallWindowProc16. --- dlls/user32/msg16.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index db6de66..5304a9d 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -1536,8 +1536,11 @@ LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg, if (index == -1 || index >= MAX_WINPROCS32) call_window_proc16( hwnd, msg, wParam, lParam, &result, func ); else - WINPROC_CallProc16To32A( call_window_proc_callback, hwnd, msg, wParam, lParam, &result, - thunk_array[index].proc ); + { + WNDPROC proc = (WNDPROC)func; + if (thunk_array && thunk_array[index].proc) proc = thunk_array[index].proc; + WINPROC_CallProc16To32A( call_window_proc_callback, hwnd, msg, wParam, lParam, &result, proc ); + } return result; }

1 0