August 2007 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : wordpad: Display error box when richedit loading fails.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 3161a3cd5dd1feec86cbc192a3c028bda5582d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3161a3cd5dd1feec86cbc192a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 15:44:24 2007 +0200 wordpad: Display error box when richedit loading fails. --- programs/wordpad/De.rc | 1 + programs/wordpad/En.rc | 1 + programs/wordpad/Fr.rc | 1 + programs/wordpad/Hu.rc | 1 + programs/wordpad/Ko.rc | 1 + programs/wordpad/Nl.rc | 1 + programs/wordpad/No.rc | 1 + programs/wordpad/Pl.rc | 1 + programs/wordpad/Ru.rc | 1 + programs/wordpad/Tr.rc | 1 + programs/wordpad/resource.h | 1 + programs/wordpad/wordpad.c | 7 ++++++- 12 files changed, 17 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 4647a21..266db58 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -104,4 +104,5 @@ BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." + STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." END diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 14c1a3e..208d600 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -104,4 +104,5 @@ BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." + STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." END diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 14527e3..1ea4c4f 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -104,4 +104,5 @@ BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." + STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." END diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index c3b220d..7b9fa75 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -104,4 +104,5 @@ BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." + STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." END diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 2712d52..d76cf4d 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -105,4 +105,5 @@ BEGIN STRING_DEFAULT_FILENAME, "��" STRING_PROMPT_SAVE_CHANGES, "'%s'�� ٲ� �� ϰڽ��ϱ�?" STRING_SEARCH_FINISHED, "Finished searching the document." + STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." END diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 72a73c0..47f1d16 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -104,4 +104,5 @@ BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." + STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 3e8a9a5..8f83a74 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -104,4 +104,5 @@ BEGIN STRING_DEFAULT_FILENAME, "Dokument" STRING_PROMPT_SAVE_CHANGES, "Lagre endringer i �%s�?" STRING_SEARCH_FINISHED, "Ferdig med � s�ke i dokumentet." + STRING_LOAD_RICHED_FAILED, "Klarte ikke laste RichEdit-biblioteket." END diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 1056375..185c4e6 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -105,4 +105,5 @@ BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." + STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." END diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 800bf3f..1bb5b44 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -102,4 +102,5 @@ BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." + STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." END diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index fd25eaf..0fc5f09 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -106,4 +106,5 @@ BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." + STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." END diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 8ee7156..5540a8d 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -85,3 +85,4 @@ #define STRING_DEFAULT_FILENAME 1403 #define STRING_PROMPT_SAVE_CHANGES 1404 #define STRING_SEARCH_FINISHED 1405 +#define STRING_LOAD_RICHED_FAILED 1406 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0c384bd..c91ad39 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -677,7 +677,12 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hReBarWnd, RB_INSERTBAND, BANDID_FORMATBAR, (LPARAM)&rbb); hDLL = LoadLibraryW(wszRichEditDll); - assert(hDLL); + if(!hDLL) + { + MessageBoxW(hWnd, MAKEINTRESOURCEW(STRING_LOAD_RICHED_FAILED), wszAppTitle, + MB_OK | MB_ICONEXCLAMATION); + PostQuitMessage(1); + } hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL, WS_CHILD|WS_VISIBLE|ES_MULTILINE|ES_AUTOVSCROLL|ES_WANTRETURN|WS_VSCROLL,

1 0

Alexander Nicolaysen Sørnes : wordpad: Add search functionality.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 55949aedd45e9aacabdc9e2816a2e192b29349bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=55949aedd45e9aacabdc9e281… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 15:41:33 2007 +0200 wordpad: Add search functionality. --- programs/wordpad/De.rc | 4 + programs/wordpad/En.rc | 4 + programs/wordpad/Fr.rc | 4 + programs/wordpad/Hu.rc | 4 + programs/wordpad/Ko.rc | 4 + programs/wordpad/Nl.rc | 4 + programs/wordpad/No.rc | 6 ++- programs/wordpad/Pl.rc | 4 + programs/wordpad/Ru.rc | 4 + programs/wordpad/Tr.rc | 4 + programs/wordpad/resource.h | 2 + programs/wordpad/rsrc.rc | 2 + programs/wordpad/wordpad.c | 148 ++++++++++++++++++++++++++++++++++++++++++- 13 files changed, 192 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55949aedd45e9aacabdc9…

1 0

Alexander Nicolaysen Sørnes : comdlg32: PrintDlg: Set PD_SELECTION on return.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 0f20a83cae6fbb8cd9a23d1162194d5753cf92e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f20a83cae6fbb8cd9a23d116… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 25 21:08:33 2007 +0200 comdlg32: PrintDlg: Set PD_SELECTION on return. --- dlls/comdlg32/printdlg.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 4bc1921..5301646 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -324,6 +324,11 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg, else lppd->Flags &= ~PD_PAGENUMS; + if (IsDlgButtonChecked(hDlg, rad2) == BST_CHECKED) /* Selection */ + lppd->Flags |= PD_SELECTION; + else + lppd->Flags &= ~PD_SELECTION; + if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */ static char file[] = "FILE:"; lppd->Flags |= PD_PRINTTOFILE; @@ -402,6 +407,11 @@ static BOOL PRINTDLG_UpdatePrintDlgW(HWND hDlg, else lppd->Flags &= ~PD_PAGENUMS; + if (IsDlgButtonChecked(hDlg, rad2) == BST_CHECKED) /* Selection */ + lppd->Flags |= PD_SELECTION; + else + lppd->Flags &= ~PD_SELECTION; + if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */ static WCHAR file[] = {'F','I','L','E',':',0}; lppd->Flags |= PD_PRINTTOFILE;

1 0

Andrew Talbot : rpcrt4: Constify some variables.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: fa3d623882894a3919f3fdfd96d0db71e49aa40c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3d623882894a3919f3fdfd9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Aug 17 22:10:58 2007 +0100 rpcrt4: Constify some variables. --- dlls/rpcrt4/ndr_marshall.c | 16 ++++++++-------- dlls/rpcrt4/rpc_binding.c | 4 ++-- dlls/rpcrt4/rpc_binding.h | 5 +++-- dlls/rpcrt4/rpc_message.c | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b1b8fa3..de84410 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1748,7 +1748,7 @@ void WINAPI NdrSimpleStructFree(PMIDL_STUB_MESSAGE pStubMsg, } -static unsigned long EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned long EmbeddedComplexSize(const MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) { switch (*pFormat) { @@ -3109,7 +3109,7 @@ void WINAPI NdrComplexArrayFree(PMIDL_STUB_MESSAGE pStubMsg, pMemory = ComplexFree(pStubMsg, pMemory, pFormat, NULL); } -static ULONG UserMarshalFlags(PMIDL_STUB_MESSAGE pStubMsg) +static ULONG UserMarshalFlags(const MIDL_STUB_MESSAGE *pStubMsg) { return MAKELONG(pStubMsg->dwDestContext, pStubMsg->RpcMsg->DataRepresentation); @@ -4419,7 +4419,7 @@ void WINAPI NdrVaryingArrayFree(PMIDL_STUB_MESSAGE pStubMsg, EmbeddedPointerFree(pStubMsg, pMemory, pFormat); } -static ULONG get_discriminant(unsigned char fc, unsigned char *pMemory) +static ULONG get_discriminant(unsigned char fc, const unsigned char *pMemory) { switch (fc) { @@ -4427,16 +4427,16 @@ static ULONG get_discriminant(unsigned char fc, unsigned char *pMemory) case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - return *(UCHAR *)pMemory; + return *(const UCHAR *)pMemory; case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: case RPC_FC_ENUM16: - return *(USHORT *)pMemory; + return *(const USHORT *)pMemory; case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: - return *(ULONG *)pMemory; + return *(const ULONG *)pMemory; default: FIXME("Unhandled base type: 0x%02x\n", fc); return 0; @@ -5773,7 +5773,7 @@ static struct context_handle_entry *get_context_entry(NDR_CCONTEXT CContext) return che; } -static struct context_handle_entry *context_entry_from_guid(LPGUID uuid) +static struct context_handle_entry *context_entry_from_guid(LPCGUID uuid) { struct context_handle_entry *che; LIST_FOR_EACH_ENTRY(che, &context_handle_list, struct context_handle_entry, entry) @@ -5823,7 +5823,7 @@ void WINAPI NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff) static UINT ndr_update_context_handle(NDR_CCONTEXT *CContext, RPC_BINDING_HANDLE hBinding, - ndr_context_handle *chi) + const ndr_context_handle *chi) { struct context_handle_entry *che = NULL; diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index db30be6..f69d290 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -274,8 +274,8 @@ RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding) } RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, - PRPC_SYNTAX_IDENTIFIER TransferSyntax, - PRPC_SYNTAX_IDENTIFIER InterfaceId) + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, + const RPC_SYNTAX_IDENTIFIER *InterfaceId) { TRACE("(Binding == ^%p)\n", Binding); diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 5113b27..f01ae6e 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -161,13 +161,14 @@ RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid); RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection); RPC_STATUS RPCRT4_ExportBinding(RpcBinding** Binding, RpcBinding* OldBinding); RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding); -RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, PRPC_SYNTAX_IDENTIFIER TransferSyntax, PRPC_SYNTAX_IDENTIFIER InterfaceId); +RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId); RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection); BOOL RPCRT4_RPCSSOnDemandCall(PRPCSS_NP_MESSAGE msg, char *vardata_payload, PRPCSS_NP_REPLY reply); HANDLE RPCRT4_GetMasterMutex(void); HANDLE RPCRT4_RpcssNPConnect(void); -static inline const char *rpcrt4_conn_get_name(RpcConnection *Connection) +static inline const char *rpcrt4_conn_get_name(const RpcConnection *Connection) { return Connection->ops->name; } diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index b19e7f1..37839f7 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -440,7 +440,7 @@ static RPC_STATUS RPCRT4_SecurePacket(RpcConnection *Connection, */ static RPC_STATUS RPCRT4_SendAuth(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength, - void *Auth, unsigned int AuthLength) + const void *Auth, unsigned int AuthLength) { PUCHAR buffer_pos; DWORD hdr_size;

1 0

Stefan Leichter : urlmon: Remove 'recursive registry key delete' function.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: ba026b16349b24c4a0d2eb909f9c5eb00b188c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba026b16349b24c4a0d2eb909… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Aug 18 10:04:22 2007 +0200 urlmon: Remove 'recursive registry key delete' function. --- dlls/urlmon/regsvr.c | 79 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 64eb1a7..e989323 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -121,9 +121,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -212,7 +209,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -319,16 +317,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -441,70 +442,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Misha Koshelev : shlwapi: Take sizeof(WCHAR) into account when allocating Unicode string.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 108a61f8e7044b0d1b785e50cd9681db74c5b148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108a61f8e7044b0d1b785e50c… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Aug 19 01:52:22 2007 -0500 shlwapi: Take sizeof(WCHAR) into account when allocating Unicode string. --- dlls/shlwapi/url.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 68d9309..e1c0aa6 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -332,7 +332,8 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, } nByteLen = (lstrlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */ - lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, INTERNET_MAX_URL_LENGTH); + lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, + INTERNET_MAX_URL_LENGTH * sizeof(WCHAR)); if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) && !memcmp(wszFile, pszUrl, sizeof(wszFile)))

1 0

Mikolaj Zalewski : iexplore: Add VERSIONINFO resource.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 95aaca1707ee4be27dc6cae2472900bea1a94ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95aaca1707ee4be27dc6cae24… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Aug 17 11:39:07 2007 -0700 iexplore: Add VERSIONINFO resource. --- .gitignore | 1 + programs/iexplore/Makefile.in | 2 ++ programs/iexplore/version.rc | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index e141f2d..be3dbc0 100644 --- a/.gitignore +++ b/.gitignore @@ -789,6 +789,7 @@ programs/explorer/explorer programs/hh/hh programs/icinfo/icinfo programs/iexplore/iexplore +programs/iexplore/version.res programs/msiexec/msiexec programs/msiexec/msiexec.ico programs/msiexec/rsrc.res diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 4a55e72..219369c 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -9,6 +9,8 @@ IMPORTS = shdocvw user32 gdi32 kernel32 C_SRCS = \ main.c +RC_SRCS = version.rc + @MAKE_PROG_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/iexplore/version.rc b/programs/iexplore/version.rc new file mode 100644 index 0000000..bc80f6c --- /dev/null +++ b/programs/iexplore/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2003 Francois Gouget (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine core exe" +#define WINE_FILENAME_STR "iexplore.exe" +#define WINE_FILEVERSION 6,0,2900,2180 +#define WINE_FILEVERSION_STR "6.0.2900.2180" +#define WINE_PRODUCTVERSION 6,0,2900,2180 +#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" + +#include "wine/wine_common_ver.rc"

1 0

Juan Lang : crypt32: Don't store the crypto provider when it isn't needed.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 1d534244702f7c5ca64d707628fd397cbcbb0b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d534244702f7c5ca64d70762… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 17 11:59:28 2007 -0700 crypt32: Don't store the crypto provider when it isn't needed. --- dlls/crypt32/collectionstore.c | 3 +-- dlls/crypt32/crypt32_private.h | 10 ++++------ dlls/crypt32/filestore.c | 9 ++++++--- dlls/crypt32/provstore.c | 11 ++++------- dlls/crypt32/regstore.c | 7 +++++-- dlls/crypt32/store.c | 33 +++++++++++++++++---------------- 6 files changed, 37 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d534244702f7c5ca64d7…

1 0

Juan Lang : crypt32: Don' t store redundant copy of crypto provider in file store.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 9be5007669af733bf9ae81bedfca83eeda5f144f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be5007669af733bf9ae81bed… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 17 11:58:48 2007 -0700 crypt32: Don't store redundant copy of crypto provider in file store. --- dlls/crypt32/filestore.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index 07ab6f1..45becca 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -28,7 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); typedef struct _WINE_FILESTOREINFO { DWORD dwOpenFlags; - HCRYPTPROV cryptProv; HCERTSTORE memStore; HANDLE file; BOOL dirty; @@ -182,7 +181,6 @@ PWINECRYPT_CERTSTORE CRYPT_FileOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, CERT_STORE_PROV_INFO provInfo = { 0 }; info->dwOpenFlags = dwFlags; - info->cryptProv = hCryptProv; info->memStore = memStore; info->file = file; info->dirty = FALSE;

1 0

Juan Lang : crypt32: Don' t store redundant copy of crypto provider in reg store.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 065ed54f690584ee52c46869a755702b4dd0eb05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=065ed54f690584ee52c46869a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 17 11:58:17 2007 -0700 crypt32: Don't store redundant copy of crypto provider in reg store. --- dlls/crypt32/regstore.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index b2a35eb..7bfb4df 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -37,7 +37,6 @@ typedef struct _WINE_HASH_TO_DELETE typedef struct _WINE_REGSTOREINFO { DWORD dwOpenFlags; - HCRYPTPROV cryptProv; HCERTSTORE memStore; HKEY key; BOOL dirty; @@ -518,7 +517,6 @@ PWINECRYPT_CERTSTORE CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, CERT_STORE_PROV_INFO provInfo = { 0 }; regInfo->dwOpenFlags = dwFlags; - regInfo->cryptProv = hCryptProv; regInfo->memStore = memStore; regInfo->key = key; InitializeCriticalSection(&regInfo->cs);

1 0