November 2009 - Wine-Commits

Juan Lang : crypt32: Add openssl.org's cert to the tested chains.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: a29789e0bfa134d6127b7590d839ad135254d781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29789e0bfa134d6127b7590d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 16:25:21 2009 -0800 crypt32: Add openssl.org's cert to the tested chains. --- dlls/crypt32/tests/chain.c | 254 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 254 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a29789e0bfa134d6127b7…

1 0

Vincent Povirk : ole32: Rename dirProperty to dirRootEntry.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: 5969bde0b17ff8fc0efc6f1343f4d708125c0ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5969bde0b17ff8fc0efc6f134… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 11 10:40:12 2009 -0600 ole32: Rename dirProperty to dirRootEntry. --- dlls/ole32/storage32.c | 30 +++++++++++++++--------------- dlls/ole32/storage32.h | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b24bcff..97a76cc 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -865,7 +865,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( newStreamProperty.leftChild = DIRENTRY_NULL; newStreamProperty.rightChild = DIRENTRY_NULL; - newStreamProperty.dirProperty = DIRENTRY_NULL; + newStreamProperty.dirRootEntry = DIRENTRY_NULL; /* call CoFileTime to get the current time newStreamProperty.ctime @@ -1048,7 +1048,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( newProperty.leftChild = DIRENTRY_NULL; newProperty.rightChild = DIRENTRY_NULL; - newProperty.dirProperty = DIRENTRY_NULL; + newProperty.dirRootEntry = DIRENTRY_NULL; /* call CoFileTime to get the current time newProperty.ctime @@ -1272,7 +1272,7 @@ static HRESULT insertIntoTree( parentStorageIndex, &currentProperty); - if (currentProperty.dirProperty != DIRENTRY_NULL) + if (currentProperty.dirRootEntry != DIRENTRY_NULL) { /* * The root storage contains some element, therefore, start the research @@ -1284,13 +1284,13 @@ static HRESULT insertIntoTree( /* * Keep the DirEntry sequence number of the storage first property */ - currentPropertyId = currentProperty.dirProperty; + currentPropertyId = currentProperty.dirRootEntry; /* * Read */ StorageImpl_ReadDirEntry(This, - currentProperty.dirProperty, + currentProperty.dirRootEntry, &currentProperty); previous = currentProperty.leftChild; @@ -1355,7 +1355,7 @@ static HRESULT insertIntoTree( /* * The root storage is empty, link the new property to its dir property */ - currentProperty.dirProperty = newPropertyIndex; + currentProperty.dirRootEntry = newPropertyIndex; StorageImpl_WriteDirEntry(This, parentStorageIndex, &currentProperty); @@ -1378,7 +1378,7 @@ static ULONG findElement(StorageImpl *storage, ULONG storageEntry, /* Read the storage entry to find the root of the tree. */ StorageImpl_ReadDirEntry(storage, storageEntry, data); - currentEntry = data->dirProperty; + currentEntry = data->dirRootEntry; while (currentEntry != DIRENTRY_NULL) { @@ -1424,7 +1424,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, *parentEntry = storageEntry; *relation = PROPERTY_RELATION_DIR; - childEntry = parentData->dirProperty; + childEntry = parentData->dirRootEntry; while (childEntry != DIRENTRY_NULL) { @@ -1958,7 +1958,7 @@ static void setPropertyLink(DirEntry *property, ULONG relation, ULONG new_target property->rightChild = new_target; break; case PROPERTY_RELATION_DIR: - property->dirProperty = new_target; + property->dirRootEntry = new_target; break; default: assert(0); @@ -2272,7 +2272,7 @@ static HRESULT StorageImpl_Construct( rootProp.propertyType = STGTY_ROOT; rootProp.leftChild = DIRENTRY_NULL; rootProp.rightChild = DIRENTRY_NULL; - rootProp.dirProperty = DIRENTRY_NULL; + rootProp.dirRootEntry = DIRENTRY_NULL; rootProp.startingBlock = BLOCK_END_OF_CHAIN; rootProp.size.u.HighPart = 0; rootProp.size.u.LowPart = 0; @@ -3073,8 +3073,8 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) StorageUtl_WriteDWord( buffer, - OFFSET_PS_DIRPROP, - newData->dirProperty); + OFFSET_PS_DIRROOT, + newData->dirRootEntry); StorageUtl_WriteGUID( buffer, @@ -3159,8 +3159,8 @@ BOOL StorageImpl_ReadDirEntry( StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_DIRPROP, - &buffer->dirProperty); + OFFSET_PS_DIRROOT, + &buffer->dirRootEntry); StorageUtl_ReadGUID( currentProperty, @@ -3729,7 +3729,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset( /* * Push the search node in the search stack. */ - IEnumSTATSTGImpl_PushSearchNode(This, rootProperty.dirProperty); + IEnumSTATSTGImpl_PushSearchNode(This, rootProperty.dirRootEntry); } return S_OK; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index a2cd6fe..87de749 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -56,7 +56,7 @@ static const ULONG OFFSET_PS_NAMELENGTH = 0x00000040; static const ULONG OFFSET_PS_STGTYPE = 0x00000042; static const ULONG OFFSET_PS_LEFTCHILD = 0x00000044; static const ULONG OFFSET_PS_RIGHTCHILD = 0x00000048; -static const ULONG OFFSET_PS_DIRPROP = 0x0000004C; +static const ULONG OFFSET_PS_DIRROOT = 0x0000004C; static const ULONG OFFSET_PS_GUID = 0x00000050; static const ULONG OFFSET_PS_CTIMELOW = 0x00000064; static const ULONG OFFSET_PS_CTIMEHIGH = 0x00000068; @@ -132,7 +132,7 @@ struct DirEntry BYTE propertyType; ULONG leftChild; ULONG rightChild; - ULONG dirProperty; + ULONG dirRootEntry; GUID propertyUniqueID; FILETIME ctime; FILETIME mtime;

1 0

Maarten Lankhorst : include: Add partial propsys header.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: ec6b08f62013eb8d3cf087e4ede5777797e32654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6b08f62013eb8d3cf087e4e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 11 10:56:03 2009 +0100 include: Add partial propsys header. --- .gitignore | 1 + include/Makefile.in | 1 + include/propsys.idl | 815 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 817 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec6b08f62013eb8d3cf08…

1 0

Vincent Povirk : ole32: Rename PROPERTY_RELATION constants to DIRENTRY_RELATION.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: 5838bcf8017d5c231efafece41010c1a4000622f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5838bcf8017d5c231efafece4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 11 10:42:19 2009 -0600 ole32: Rename PROPERTY_RELATION constants to DIRENTRY_RELATION. --- dlls/ole32/storage32.c | 12 ++++++------ dlls/ole32/storage32.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 97a76cc..898695c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1422,7 +1422,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, StorageImpl_ReadDirEntry(storage, storageEntry, parentData); *parentEntry = storageEntry; - *relation = PROPERTY_RELATION_DIR; + *relation = DIRENTRY_RELATION_DIR; childEntry = parentData->dirRootEntry; @@ -1442,7 +1442,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, { *parentData = childData; *parentEntry = childEntry; - *relation = PROPERTY_RELATION_PREVIOUS; + *relation = DIRENTRY_RELATION_PREVIOUS; childEntry = parentData->leftChild; } @@ -1451,7 +1451,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, { *parentData = childData; *parentEntry = childEntry; - *relation = PROPERTY_RELATION_NEXT; + *relation = DIRENTRY_RELATION_NEXT; childEntry = parentData->rightChild; } @@ -1951,13 +1951,13 @@ static void setPropertyLink(DirEntry *property, ULONG relation, ULONG new_target { switch (relation) { - case PROPERTY_RELATION_PREVIOUS: + case DIRENTRY_RELATION_PREVIOUS: property->leftChild = new_target; break; - case PROPERTY_RELATION_NEXT: + case DIRENTRY_RELATION_NEXT: property->rightChild = new_target; break; - case PROPERTY_RELATION_DIR: + case DIRENTRY_RELATION_DIR: property->dirRootEntry = new_target; break; default: diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 87de749..c740747 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -80,11 +80,11 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; #define RAW_DIRENTRY_SIZE 0x00000080 /* - * Property type of relation + * Type of child entry link */ -#define PROPERTY_RELATION_PREVIOUS 0 -#define PROPERTY_RELATION_NEXT 1 -#define PROPERTY_RELATION_DIR 2 +#define DIRENTRY_RELATION_PREVIOUS 0 +#define DIRENTRY_RELATION_NEXT 1 +#define DIRENTRY_RELATION_DIR 2 /* * type constant used in files for the root storage

1 0

Vincent Povirk : ole32: Rename PROPSET_BLOCK_SIZE to RAW_DIRENTRY_SIZE.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: 8a8471a765a6b4310974acd948f7657d0e4b8b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8471a765a6b4310974acd94… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 11 10:34:45 2009 -0600 ole32: Rename PROPSET_BLOCK_SIZE to RAW_DIRENTRY_SIZE. --- dlls/ole32/storage32.c | 26 +++++++++++++------------- dlls/ole32/storage32.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 70a1c33..b24bcff 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1099,7 +1099,7 @@ static HRESULT createDirEntry( ULONG currentPropertyIndex = 0; ULONG newPropertyIndex = DIRENTRY_NULL; HRESULT hr = S_OK; - BYTE currentData[PROPSET_BLOCK_SIZE]; + BYTE currentData[RAW_DIRENTRY_SIZE]; WORD sizeOfNameString; do @@ -1139,7 +1139,7 @@ static HRESULT createDirEntry( */ if (FAILED(hr)) { - BYTE emptyData[PROPSET_BLOCK_SIZE]; + BYTE emptyData[RAW_DIRENTRY_SIZE]; ULARGE_INTEGER newSize; ULONG propertyIndex; ULONG lastProperty = 0; @@ -1166,12 +1166,12 @@ static HRESULT createDirEntry( * memset the empty property in order to initialize the unused newly * created property */ - memset(&emptyData, 0, PROPSET_BLOCK_SIZE); + memset(&emptyData, 0, RAW_DIRENTRY_SIZE); /* * initialize them */ - lastProperty = storage->bigBlockSize / PROPSET_BLOCK_SIZE * blockCount; + lastProperty = storage->bigBlockSize / RAW_DIRENTRY_SIZE * blockCount; for( propertyIndex = newPropertyIndex + 1; @@ -1206,9 +1206,9 @@ static HRESULT destroyDirEntry( ULONG index) { HRESULT hr; - BYTE emptyData[PROPSET_BLOCK_SIZE]; + BYTE emptyData[RAW_DIRENTRY_SIZE]; - memset(&emptyData, 0, PROPSET_BLOCK_SIZE); + memset(&emptyData, 0, RAW_DIRENTRY_SIZE); hr = StorageImpl_WriteRawDirEntry(storage, index, emptyData); @@ -3000,12 +3000,12 @@ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer ULONG bytesRead; offset.u.HighPart = 0; - offset.u.LowPart = index * PROPSET_BLOCK_SIZE; + offset.u.LowPart = index * RAW_DIRENTRY_SIZE; hr = BlockChainStream_ReadAt( This->rootBlockChain, offset, - PROPSET_BLOCK_SIZE, + RAW_DIRENTRY_SIZE, buffer, &bytesRead); @@ -3026,12 +3026,12 @@ HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE ULONG bytesRead; offset.u.HighPart = 0; - offset.u.LowPart = index * PROPSET_BLOCK_SIZE; + offset.u.LowPart = index * RAW_DIRENTRY_SIZE; hr = BlockChainStream_WriteAt( This->rootBlockChain, offset, - PROPSET_BLOCK_SIZE, + RAW_DIRENTRY_SIZE, buffer, &bytesRead); @@ -3047,7 +3047,7 @@ HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE */ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) { - memset(buffer, 0, PROPSET_BLOCK_SIZE); + memset(buffer, 0, RAW_DIRENTRY_SIZE); memcpy( buffer + OFFSET_PS_NAME, @@ -3122,7 +3122,7 @@ BOOL StorageImpl_ReadDirEntry( ULONG index, DirEntry* buffer) { - BYTE currentProperty[PROPSET_BLOCK_SIZE]; + BYTE currentProperty[RAW_DIRENTRY_SIZE]; HRESULT readRes; readRes = StorageImpl_ReadRawDirEntry(This, index, currentProperty); @@ -3211,7 +3211,7 @@ BOOL StorageImpl_WriteDirEntry( ULONG index, const DirEntry* buffer) { - BYTE currentProperty[PROPSET_BLOCK_SIZE]; + BYTE currentProperty[RAW_DIRENTRY_SIZE]; HRESULT writeRes; UpdateRawDirEntry(currentProperty, buffer); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index bed3a07..a2cd6fe 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -77,7 +77,7 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; #define DIRENTRY_NAME_MAX_LEN 0x20 #define DIRENTRY_NAME_BUFFER_LEN 0x40 -#define PROPSET_BLOCK_SIZE 0x00000080 +#define RAW_DIRENTRY_SIZE 0x00000080 /* * Property type of relation

1 0

Alexandre Julliard : user32: Use the correct type for the return value of DefDlgProcA/W.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: b76f85872c061f2a9645780cd61427d1c4226cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76f85872c061f2a9645780cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 11:52:15 2009 +0100 user32: Use the correct type for the return value of DefDlgProcA/W. --- dlls/user32/defdlg.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index e57dae9..3db59ad 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -317,22 +317,6 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, } /*********************************************************************** - * DEFDLG_Epilog - */ -static LRESULT DEFDLG_Epilog(HWND hwnd, UINT msg, BOOL fResult) -{ - /* see SDK 3.1 */ - - if ((msg >= WM_CTLCOLORMSGBOX && msg <= WM_CTLCOLORSTATIC) || - msg == WM_CTLCOLOR || msg == WM_COMPAREITEM || - msg == WM_VKEYTOITEM || msg == WM_CHARTOITEM || - msg == WM_QUERYDRAGICON || msg == WM_INITDIALOG) - return fResult; - - return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); -} - -/*********************************************************************** * DIALOG_get_info * * Get the DIALOGINFO structure of a window, allocating it if needed @@ -380,7 +364,7 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; - BOOL result = FALSE; + LRESULT result = 0; /* Perform DIALOGINFO initialization if not done */ if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0; @@ -420,7 +404,14 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) return DefWindowProcA( hwnd, msg, wParam, lParam ); } } - return DEFDLG_Epilog(hwnd, msg, result); + + if ((msg >= WM_CTLCOLORMSGBOX && msg <= WM_CTLCOLORSTATIC) || + msg == WM_CTLCOLOR || msg == WM_COMPAREITEM || + msg == WM_VKEYTOITEM || msg == WM_CHARTOITEM || + msg == WM_QUERYDRAGICON || msg == WM_INITDIALOG) + return result; + + return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } @@ -430,8 +421,8 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; - BOOL result = FALSE; DLGPROC dlgproc; + LRESULT result = 0; /* Perform DIALOGINFO initialization if not done */ if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0; @@ -471,5 +462,12 @@ LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) return DefWindowProcW( hwnd, msg, wParam, lParam ); } } - return DEFDLG_Epilog(hwnd, msg, result); + + if ((msg >= WM_CTLCOLORMSGBOX && msg <= WM_CTLCOLORSTATIC) || + msg == WM_CTLCOLOR || msg == WM_COMPAREITEM || + msg == WM_VKEYTOITEM || msg == WM_CHARTOITEM || + msg == WM_QUERYDRAGICON || msg == WM_INITDIALOG) + return result; + + return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); }

1 0

Erich Hoover : wineconsole: Fix Alt+F10 sent when F10 pressed.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: 8a6e2c8eeac1b4d0ca1b7b6a6c3d1b0e0a949532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6e2c8eeac1b4d0ca1b7b6a6… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Nov 12 10:36:08 2009 -0700 wineconsole: Fix Alt+F10 sent when F10 pressed. --- programs/wineconsole/user.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 391e833..15626d4 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1015,7 +1015,7 @@ static void WCUSER_HandleSelectionKey(struct inner_data* data, BOOL down, * generates input_record from windows WM_KEYUP/WM_KEYDOWN messages */ static void WCUSER_GenerateKeyInputRecord(struct inner_data* data, BOOL down, - WPARAM wParam, LPARAM lParam, BOOL sys) + WPARAM wParam, LPARAM lParam) { INPUT_RECORD ir; DWORD n; @@ -1033,7 +1033,6 @@ static void WCUSER_GenerateKeyInputRecord(struct inner_data* data, BOOL down, ir.Event.KeyEvent.uChar.UnicodeChar = 0; ir.Event.KeyEvent.dwControlKeyState = WCUSER_GetCtrlKeyState(keyState); if (lParam & (1L << 24)) ir.Event.KeyEvent.dwControlKeyState |= ENHANCED_KEY; - if (sys) ir.Event.KeyEvent.dwControlKeyState |= LEFT_ALT_PRESSED; /* FIXME: gotta choose one */ if (down) { @@ -1112,11 +1111,11 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM if (PRIVATE(data)->has_selection) WCUSER_HandleSelectionKey(data, uMsg == WM_KEYDOWN, wParam, lParam); else - WCUSER_GenerateKeyInputRecord(data, uMsg == WM_KEYDOWN, wParam, lParam, FALSE); + WCUSER_GenerateKeyInputRecord(data, uMsg == WM_KEYDOWN, wParam, lParam); break; case WM_SYSKEYDOWN: case WM_SYSKEYUP: - WCUSER_GenerateKeyInputRecord(data, uMsg == WM_SYSKEYDOWN, wParam, lParam, TRUE); + WCUSER_GenerateKeyInputRecord(data, uMsg == WM_SYSKEYDOWN, wParam, lParam); break; case WM_LBUTTONDOWN: if (data->curcfg.quick_edit || PRIVATE(data)->has_selection)

1 0

Vincent Povirk : ole32: Rename PROPERTY_NULL to DIRENTRY_NULL.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: 86759988f160bd4ca8d8520e95461857b3d00910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86759988f160bd4ca8d8520e9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:55:25 2009 -0600 ole32: Rename PROPERTY_NULL to DIRENTRY_NULL. --- dlls/ole32/storage32.c | 78 ++++++++++++++++++++++++------------------------ dlls/ole32/storage32.h | 2 +- 2 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86759988f160bd4ca8d85…

1 0

Vincent Povirk : ole32: Rename PROPERTY_NAME_*_LEN to DIRENTRY_NAME_*_LEN.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: 74d050302615037751c2edbc7233149647f4f1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d050302615037751c2edbc7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 11 10:31:55 2009 -0600 ole32: Rename PROPERTY_NAME_*_LEN to DIRENTRY_NAME_*_LEN. --- dlls/ole32/storage32.c | 12 ++++++------ dlls/ole32/storage32.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c2adc32..70a1c33 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -853,7 +853,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( newStreamProperty.sizeOfNameString = ( lstrlenW(pwcsName)+1 ) * sizeof(WCHAR); - if (newStreamProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN) + if (newStreamProperty.sizeOfNameString > DIRENTRY_NAME_BUFFER_LEN) return STG_E_INVALIDNAME; strcpyW(newStreamProperty.name, pwcsName); @@ -1033,7 +1033,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( newProperty.sizeOfNameString = (lstrlenW(pwcsName)+1)*sizeof(WCHAR); - if (newProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN) + if (newProperty.sizeOfNameString > DIRENTRY_NAME_BUFFER_LEN) { FIXME("name too long\n"); return STG_E_INVALIDNAME; @@ -3052,7 +3052,7 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) memcpy( buffer + OFFSET_PS_NAME, newData->name, - PROPERTY_NAME_BUFFER_LEN ); + DIRENTRY_NAME_BUFFER_LEN ); memcpy(buffer + OFFSET_PS_STGTYPE, &newData->propertyType, 1); @@ -3137,7 +3137,7 @@ BOOL StorageImpl_ReadDirEntry( memcpy( buffer->name, propName, - PROPERTY_NAME_BUFFER_LEN ); + DIRENTRY_NAME_BUFFER_LEN ); TRACE("storage name: %s\n", debugstr_w(buffer->name)); memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_STGTYPE, 1); @@ -5840,8 +5840,8 @@ HRESULT WINAPI StgOpenStorage( /* prepare the file name string given in lieu of the root property name */ GetFullPathNameW(pwcsName, MAX_PATH, fullname, NULL); - memcpy(newStorage->filename, fullname, PROPERTY_NAME_BUFFER_LEN); - newStorage->filename[PROPERTY_NAME_BUFFER_LEN-1] = '\0'; + memcpy(newStorage->filename, fullname, DIRENTRY_NAME_BUFFER_LEN); + newStorage->filename[DIRENTRY_NAME_BUFFER_LEN-1] = '\0'; /* * Get an "out" pointer for the caller. diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 1bc5b41..bed3a07 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -74,8 +74,8 @@ static const ULONG BLOCK_END_OF_CHAIN = 0xFFFFFFFE; static const ULONG BLOCK_UNUSED = 0xFFFFFFFF; static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; -#define PROPERTY_NAME_MAX_LEN 0x20 -#define PROPERTY_NAME_BUFFER_LEN 0x40 +#define DIRENTRY_NAME_MAX_LEN 0x20 +#define DIRENTRY_NAME_BUFFER_LEN 0x40 #define PROPSET_BLOCK_SIZE 0x00000080 @@ -127,7 +127,7 @@ typedef struct StgStreamImpl StgStreamImpl; */ struct DirEntry { - WCHAR name[PROPERTY_NAME_MAX_LEN]; + WCHAR name[DIRENTRY_NAME_MAX_LEN]; WORD sizeOfNameString; BYTE propertyType; ULONG leftChild; @@ -255,7 +255,7 @@ struct StorageImpl The behaviour of STGM_SIMPLE depends on this */ /* FIXME: should this be in Storage32BaseImpl ? */ - WCHAR filename[PROPERTY_NAME_BUFFER_LEN]; + WCHAR filename[DIRENTRY_NAME_BUFFER_LEN]; /* * File header

1 0

Alexandre Julliard : user32: Reimplement DefDlgProc16 using message mapping functions.
by Alexandre Julliard Nov. 13, 2009

Nov. 13, 2009

Module: wine Branch: master Commit: 76dcb0ecb9c64a949314efa30ce32a29f3ba7b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dcb0ecb9c64a949314efa30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 11:11:31 2009 +0100 user32: Reimplement DefDlgProc16 using message mapping functions. --- dlls/user32/defdlg.c | 55 +------------------------------------------------- dlls/user32/msg16.c | 18 ++++++++++++++++ 2 files changed, 19 insertions(+), 54 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 6096890..e57dae9 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" +#include "winuser.h" #include "controls.h" #include "win.h" #include "user_private.h" @@ -374,59 +374,6 @@ out: } /*********************************************************************** - * DefDlgProc (USER.308) - */ -LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, - LPARAM lParam ) -{ - DIALOGINFO *dlgInfo; - DLGPROC16 dlgproc; - HWND hwnd32 = WIN_Handle32( hwnd ); - BOOL result = FALSE; - - /* Perform DIALOGINFO initialization if not done */ - if(!(dlgInfo = DIALOG_get_info(hwnd32, TRUE))) return 0; - - SetWindowLongPtrW( hwnd32, DWLP_MSGRESULT, 0 ); - - if ((dlgproc = (DLGPROC16)DEFDLG_GetDlgProc( hwnd32 ))) /* Call dialog procedure */ - result = WINPROC_CallDlgProc16( dlgproc, hwnd, msg, wParam, lParam ); - - if (!result && IsWindow(hwnd32)) - { - /* callback didn't process this message */ - - switch(msg) - { - case WM_ERASEBKGND: - case WM_SHOWWINDOW: - case WM_ACTIVATE: - case WM_SETFOCUS: - case DM_SETDEFID: - case DM_GETDEFID: - case WM_NEXTDLGCTL: - case WM_GETFONT: - case WM_CLOSE: - case WM_NCDESTROY: - case WM_ENTERMENULOOP: - case WM_LBUTTONDOWN: - case WM_NCLBUTTONDOWN: - return DEFDLG_Proc( hwnd32, msg, (WPARAM)wParam, lParam, dlgInfo ); - case WM_INITDIALOG: - case WM_VKEYTOITEM: - case WM_COMPAREITEM: - case WM_CHARTOITEM: - break; - - default: - return DefWindowProc16( hwnd, msg, wParam, lParam ); - } - } - return DEFDLG_Epilog( hwnd32, msg, result); -} - - -/*********************************************************************** * DefDlgProcA (USER32.@) */ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index dba7a14..d5d4825 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -77,6 +77,13 @@ static LRESULT get_message_callback( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARA return 0; } +static LRESULT defdlg_proc_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + *result = DefDlgProcA( hwnd, msg, wp, lp ); + return *result; +} + /*********************************************************************** * SendMessage (USER.111) @@ -270,6 +277,17 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam, LPAR /*********************************************************************** + * DefDlgProc (USER.308) + */ +LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) +{ + LRESULT result; + WINPROC_CallProc16To32A( defdlg_proc_callback, hwnd, msg, wParam, lParam, &result, 0 ); + return result; +} + + +/*********************************************************************** * PeekMessage (USER.109) */ BOOL16 WINAPI PeekMessage16( MSG16 *msg, HWND16 hwnd,

1 0