February 2009 - Wine-commits

Juan Lang : cryptui: Prompt whether to export the private key from CryptUIWizExport.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 53c84a8518a71ca57e42c63e5dfffc4aa747a696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c84a8518a71ca57e42c63e5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 10:28:07 2009 -0800 cryptui: Prompt whether to export the private key from CryptUIWizExport. --- dlls/cryptui/cryptui_En.rc | 14 ++++++++++ dlls/cryptui/cryptuires.h | 12 ++++++-- dlls/cryptui/main.c | 60 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 1e311a1..8e61d7b 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -161,6 +161,8 @@ STRINGTABLE DISCARDABLE IDS_NO "No" IDS_EXPORT_SUCCEEDED "The export was successful." IDS_EXPORT_FAILED "The export failed." + IDS_EXPORT_PRIVATE_KEY_TITLE "Export Private Key" + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "The certificate contains a private key which may be exported along with the certificate." } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -381,6 +383,18 @@ BEGIN -1, 115,103,195,8 END +IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificate Export Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "If you choose to export the private key, you will be prompted for a password to protect the private key on a later page.", -1, 21,1,195,23 + LTEXT "Do you wish to export the private key?", -1, 21,24,195,15 + AUTORADIOBUTTON "&Yes, export the private key", + IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "N&o, do not export the private key", + IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON +END + IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 486bae0..45eb12b 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -160,6 +160,8 @@ #define IDS_NO 1217 #define IDS_EXPORT_SUCCEEDED 1218 #define IDS_EXPORT_FAILED 1219 +#define IDS_EXPORT_PRIVATE_KEY_TITLE 1220 +#define IDS_EXPORT_PRIVATE_KEY_SUBTITLE 1221 #define IDD_GENERAL 100 #define IDD_DETAIL 101 @@ -175,9 +177,11 @@ #define IDD_CERT_MGR 111 #define IDD_CERT_MGR_ADVANCED 112 #define IDD_EXPORT_WELCOME 113 -#define IDD_EXPORT_FORMAT 114 -#define IDD_EXPORT_FILE 115 -#define IDD_EXPORT_FINISH 116 +#define IDD_EXPORT_PRIVATE_KEY 114 +#define IDD_EXPORT_PASSWORD 115 +#define IDD_EXPORT_FORMAT 116 +#define IDD_EXPORT_FILE 117 +#define IDD_EXPORT_FINISH 118 #define IDB_SMALL_ICONS 200 #define IDB_CERT 201 @@ -253,5 +257,7 @@ #define IDC_EXPORT_FILENAME 2909 #define IDC_EXPORT_BROWSE_FILE 2910 #define IDC_EXPORT_SETTINGS 2911 +#define IDC_EXPORT_PRIVATE_KEY_YES 2912 +#define IDC_EXPORT_PRIVATE_KEY_NO 2913 #endif /* ndef __CRYPTUIRES_H_ */ diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 8590d0c..70710bd 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5566,6 +5566,42 @@ static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } +static LRESULT CALLBACK export_private_key_dlg_proc(HWND hwnd, UINT msg, + WPARAM wp, LPARAM lp) +{ + LRESULT ret = 0; + + switch (msg) + { + case WM_INITDIALOG: + { + struct ExportWizData *data; + PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; + + data = (struct ExportWizData *)page->lParam; + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_PRIVATE_KEY_NO), BM_CLICK, + 0, 0); + break; + } + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lp; + + switch (hdr->code) + { + case PSN_SETACTIVE: + PostMessageW(GetParent(hwnd), PSM_SETWIZBUTTONS, 0, + PSWIZB_BACK | PSWIZB_NEXT); + ret = TRUE; + break; + } + break; + } + } + return ret; +} + static BOOL export_info_has_private_key(PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo) { BOOL ret = FALSE; @@ -6370,10 +6406,10 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, void *pvoid) { PROPSHEETHEADERW hdr; - PROPSHEETPAGEW pages[4]; + PROPSHEETPAGEW pages[6]; struct ExportWizData data; int nPages = 0; - BOOL showFormatPage = TRUE; + BOOL hasPrivateKey, showFormatPage = TRUE; data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; @@ -6402,6 +6438,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, pages[nPages].lParam = (LPARAM)&data; nPages++; + hasPrivateKey = export_info_has_private_key(pExportInfo); switch (pExportInfo->dwSubjectChoice) { case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: @@ -6419,6 +6456,21 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.contextInfo.dwExportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7; break; } + + if (hasPrivateKey && showFormatPage) + { + pages[nPages].dwSize = sizeof(pages[0]); + pages[nPages].hInstance = hInstance; + pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_EXPORT_PRIVATE_KEY); + pages[nPages].pfnDlgProc = export_private_key_dlg_proc; + pages[nPages].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + pages[nPages].pszHeaderTitle = + MAKEINTRESOURCEW(IDS_EXPORT_PRIVATE_KEY_TITLE); + pages[nPages].pszHeaderSubTitle = + MAKEINTRESOURCEW(IDS_EXPORT_PRIVATE_KEY_SUBTITLE); + pages[nPages].lParam = (LPARAM)&data; + nPages++; + } if (showFormatPage) { pages[nPages].dwSize = sizeof(pages[0]); @@ -6433,6 +6485,10 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, pages[nPages].lParam = (LPARAM)&data; nPages++; } + if (hasPrivateKey && showFormatPage) + { + FIXME("add password page\n"); + } pages[nPages].dwSize = sizeof(pages[0]); pages[nPages].hInstance = hInstance;

1 0

Juan Lang : cryptui: Make a copy of export info in CryptUIWizExport.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: bd3c99279566ac0efa691e0bc65bf86e36b7cef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3c99279566ac0efa691e0bc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 10:34:05 2009 -0800 cryptui: Make a copy of export info in CryptUIWizExport. --- dlls/cryptui/main.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 70710bd..36ba3f7 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5515,7 +5515,7 @@ struct ExportWizData HFONT titleFont; DWORD dwFlags; LPCWSTR pwszWizardTitle; - PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo; + CRYPTUI_WIZ_EXPORT_INFO exportInfo; CRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO contextInfo; LPWSTR fileName; HANDLE file; @@ -5636,7 +5636,7 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct ExportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); - hasPrivateKey = export_info_has_private_key(data->pExportInfo); + hasPrivateKey = export_info_has_private_key(&data->exportInfo); if (hasPrivateKey) EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_PFX), TRUE); switch (data->contextInfo.dwExportFormat) @@ -5762,7 +5762,7 @@ static LPWSTR export_append_extension(struct ExportWizData *data, extension = pfx; break; default: - switch (data->pExportInfo->dwSubjectChoice) + switch (data->exportInfo.dwSubjectChoice) { case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: extension = crl; @@ -5961,9 +5961,9 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct ExportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); - if (data->pExportInfo->pwszExportFileName) + if (data->exportInfo.pwszExportFileName) SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_FILENAME), WM_SETTEXT, 0, - (LPARAM)data->pExportInfo->pwszExportFileName); + (LPARAM)data->exportInfo.pwszExportFileName); break; } case WM_NOTIFY: @@ -6041,7 +6041,7 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ofn.hwndOwner = hwnd; ofn.lpstrFilter = make_export_file_filter( data->contextInfo.dwExportFormat, - data->pExportInfo->dwSubjectChoice); + data->exportInfo.dwSubjectChoice); ofn.lpstrFile = fileBuf; ofn.nMaxFile = sizeof(fileBuf) / sizeof(fileBuf[0]); fileBuf[0] = 0; @@ -6078,7 +6078,7 @@ static void show_export_details(HWND lv, struct ExportWizData *data) } item.pszText = text; - switch (data->pExportInfo->dwSubjectChoice) + switch (data->exportInfo.dwSubjectChoice) { case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: @@ -6119,7 +6119,7 @@ static void show_export_details(HWND lv, struct ExportWizData *data) SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); item.iSubItem = 1; - switch (data->pExportInfo->dwSubjectChoice) + switch (data->exportInfo.dwSubjectChoice) { case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: contentID = IDS_EXPORT_FILTER_CRL; @@ -6371,7 +6371,7 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, DWORD mbFlags; data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); - if ((data->success = do_export(data->file, data->pExportInfo, + if ((data->success = do_export(data->file, &data->exportInfo, &data->contextInfo))) { messageID = IDS_EXPORT_SUCCEEDED; @@ -6413,7 +6413,11 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; - data.pExportInfo = pExportInfo; + memset(&data.exportInfo, 0, sizeof(data.exportInfo)); + memcpy(&data.exportInfo, pExportInfo, + min(sizeof(data.exportInfo), pExportInfo->dwSize)); + if (pExportInfo->dwSize > sizeof(data.exportInfo)) + data.exportInfo.dwSize = sizeof(data.exportInfo); data.contextInfo.dwSize = sizeof(data.contextInfo); data.contextInfo.dwExportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_DER; data.contextInfo.fExportChain = FALSE;

1 0

Juan Lang : crypt32: Fix a regression in chain tests.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 42be55d744b246b790cec0607dfd5ec7beb17a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42be55d744b246b790cec0607… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 6 09:43:33 2009 -0800 crypt32: Fix a regression in chain tests. Relaxing the tests on older versions of Windows caused a couple tests to fail on more recent ones, which was unintended. --- dlls/crypt32/tests/chain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index aabea27..9fd32f5 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1183,7 +1183,7 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected, else ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == - expected->dwErrorStatus), + (expected->dwErrorStatus & ~ignore->dwErrorStatus)), "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); @@ -1258,7 +1258,8 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, chainStatus->status.dwErrorStatus || broken((chain->TrustStatus.dwErrorStatus & ~chainStatus->statusToIgnore.dwErrorStatus) == - chainStatus->status.dwErrorStatus), + (chainStatus->status.dwErrorStatus & + ~chainStatus->statusToIgnore.dwErrorStatus)), "Chain %d: expected error %08x, got %08x\n", testIndex, chainStatus->status.dwErrorStatus, chain->TrustStatus.dwErrorStatus);

1 0

Aric Stewart : msctf: Hook up ITfContextOwnerCompositionSink if present.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: a840c35d42e00455a578f5ff873751df8410e652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a840c35d42e00455a578f5ff8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 6 14:02:21 2009 -0600 msctf: Hook up ITfContextOwnerCompositionSink if present. --- dlls/msctf/context.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 37c651c..feef421 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -63,7 +63,7 @@ typedef struct tagContext { TfClientId tidOwner; ITextStoreACP *pITextStoreACP; - /* ITfContextOwnerCompositionSink */ + ITfContextOwnerCompositionSink *pITfContextOwnerCompositionSink; ITextStoreACPSink *pITextStoreACPSink; @@ -112,6 +112,9 @@ static void Context_Destructor(Context *This) if (This->pITextStoreACP) ITextStoreACPSink_Release(This->pITextStoreACP); + if (This->pITfContextOwnerCompositionSink) + ITextStoreACPSink_Release(This->pITfContextOwnerCompositionSink); + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pContextKeyEventSink) { ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); @@ -428,15 +431,22 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp This->refCount = 1; This->tidOwner = tidOwner; - if (punk && SUCCEEDED(IUnknown_QueryInterface(punk, &IID_ITextStoreACP, - (LPVOID*)&This->pITextStoreACP))) + if (punk) { - if (SUCCEEDED(TextStoreACPSink_Constructor(&This->pITextStoreACPSink, This))) - ITextStoreACP_AdviseSink(This->pITextStoreACP, &IID_ITextStoreACPSink, - (IUnknown*)This->pITextStoreACPSink, TS_AS_ALL_SINKS); + if (SUCCEEDED(IUnknown_QueryInterface(punk, &IID_ITextStoreACP, + (LPVOID*)&This->pITextStoreACP))) + { + if (SUCCEEDED(TextStoreACPSink_Constructor(&This->pITextStoreACPSink, This))) + ITextStoreACP_AdviseSink(This->pITextStoreACP, &IID_ITextStoreACPSink, + (IUnknown*)This->pITextStoreACPSink, TS_AS_ALL_SINKS); + } + + IUnknown_QueryInterface(punk, &IID_ITfContextOwnerCompositionSink, + (LPVOID*)&This->pITfContextOwnerCompositionSink); + + if (!This->pITextStoreACP && !This->pITfContextOwnerCompositionSink) + FIXME("Unhandled pUnk\n"); } - else if (punk) - FIXME("Unhandled pUnk\n"); TRACE("returning %p\n", This); *ppOut = (ITfContext*)This;

1 0

Michael Stefaniuc : spoolss: Add missing LeaveCriticalSection on error path (Smatch).
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: df271e0e8f6226e03518b0da27ee95f3d6ae1c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df271e0e8f6226e03518b0da2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 6 21:48:36 2009 +0100 spoolss: Add missing LeaveCriticalSection on error path (Smatch). --- dlls/spoolss/router.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index fb3279e..0cd24a7 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -215,7 +215,10 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) id = used_backends; backend[id] = heap_alloc_zero(sizeof(backend_t)); - if (!backend[id]) return NULL; + if (!backend[id]) { + LeaveCriticalSection(&backend_cs); + return NULL; + } backend[id]->dllname = strdupW(dllname); backend[id]->name = strdupW(name);

1 0

Michael Stefaniuc : riched20: Fix some Win64 compiler warnings.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: fb9b95b7a95e93bb6a8c529313fbf182e7e833d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9b95b7a95e93bb6a8c52931… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 6 23:46:59 2009 +0100 riched20: Fix some Win64 compiler warnings. - A HWND can be safely marshaled over a LONG as its payload is not a pointer but a user handle. - Use GetWindowLongPtr instead of GetWindowLong to retrieve a pointer. --- dlls/riched20/txthost.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5b52b9f..7fc0e5a 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -258,14 +258,14 @@ HRESULT WINAPI ITextHostImpl_TxActivate(ITextHost *iface, LONG *plOldState) { ITextHostImpl *This = (ITextHostImpl *)iface; - *plOldState = (LONG)SetActiveWindow(This->hWnd); + *plOldState = HandleToLong(SetActiveWindow(This->hWnd)); return (*plOldState ? S_OK : E_FAIL); } HRESULT WINAPI ITextHostImpl_TxDeactivate(ITextHost *iface, LONG lNewState) { - HWND ret = SetActiveWindow((HWND)lNewState); + HWND ret = SetActiveWindow(LongToHandle(lNewState)); return (ret ? S_OK : E_FAIL); } @@ -323,7 +323,7 @@ HRESULT WINAPI ITextHostImpl_TxGetScrollBars(ITextHost *iface, DWORD *pdwScrollBar) { ITextHostImpl *This = (ITextHostImpl *)iface; - ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongW(This->hWnd, 0); + ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongPtrW(This->hWnd, 0); const DWORD mask = WS_VSCROLL| WS_HSCROLL| ES_AUTOVSCROLL|

1 0

Michael Stefaniuc : include: Change two DWORD to DWORD_PTR in vfw. h to match the DDK.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 2caf7b8669d05ac7e75f75288cb93a2fef51ef04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2caf7b8669d05ac7e75f75288… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 6 23:47:52 2009 +0100 include: Change two DWORD to DWORD_PTR in vfw.h to match the DDK. --- include/vfw.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vfw.h b/include/vfw.h index 2751ef5..ed62545 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -1686,9 +1686,9 @@ typedef struct videohdr_tag { DWORD dwBufferLength; DWORD dwBytesUsed; DWORD dwTimeCaptured; - DWORD dwUser; + DWORD_PTR dwUser; DWORD dwFlags; - DWORD dwReserved[4]; + DWORD_PTR dwReserved[4]; } VIDEOHDR, *PVIDEOHDR, *LPVIDEOHDR; #define VHDR_DONE 0x00000001

1 0

Alexandre Julliard : winegcc: Don't pass the as/ld/nm commands to winebuild .
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: a5947ffcd1ffbf15587ebdcf206efdfd308a2a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5947ffcd1ffbf15587ebdcf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 20:35:56 2009 +0100 winegcc: Don't pass the as/ld/nm commands to winebuild. winebuild should be able to find them on its own. --- Make.rules.in | 2 +- tools/winegcc/winegcc.c | 6 ------ 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7066c98..3645603 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -62,7 +62,7 @@ ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLA ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) TARGETFLAGS = @TARGETFLAGS@ -WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) --as-cmd "$(AS)" +WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b288ed0..08929a3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -646,12 +646,6 @@ static void build(struct options* opts) } if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); - strarray_add(spec_args, "--as-cmd"); - strarray_add(spec_args, AS); - strarray_add(spec_args, "--ld-cmd"); - strarray_add(spec_args, LD); - strarray_add(spec_args, "--nm-cmd"); - strarray_add(spec_args, NM); strarray_addall(spec_args, strarray_fromstring(DLLFLAGS, " ")); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); strarray_add(spec_args, "-o");

1 0

Alexandre Julliard : winmm: Disable system thread if poll() support is missing.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 7ca85aa9eab5f028c5050adec7145492a208c214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca85aa9eab5f028c5050adec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 22:31:56 2009 +0100 winmm: Disable system thread if poll() support is missing. --- dlls/winmm/time.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 48ca3e8..23d0cdc 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -116,6 +116,7 @@ static inline void link_timer( WINE_TIMERENTRY *timer ) #define MMSYSTIME_MININTERVAL (1) #define MMSYSTIME_MAXINTERVAL (65535) +#ifdef HAVE_POLL /************************************************************************** * TIME_MMSysTimeCallback @@ -254,6 +255,15 @@ static void TIME_MMTimeStart(void) } } +#else /* HAVE_POLL */ + +static void TIME_MMTimeStart(void) +{ + FIXME( "not starting system thread\n" ); +} + +#endif /* HAVE_POLL */ + /************************************************************************** * TIME_MMTimeStop */

1 0

Alexandre Julliard : programs: Don't make apps Unicode if they don' t use the command line.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 8e71504e7695d518a886224729a8df1dee08cc13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e71504e7695d518a88622472… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 23:20:01 2009 +0100 programs: Don't make apps Unicode if they don't use the command line. --- programs/lodctr/Makefile.in | 2 +- programs/lodctr/lodctr_main.c | 2 +- programs/oleview/Makefile.in | 2 +- programs/oleview/oleview.c | 3 +-- programs/unlodctr/Makefile.in | 2 +- programs/unlodctr/unlodctr_main.c | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/lodctr/Makefile.in b/programs/lodctr/Makefile.in index 5446a88..572b99a 100644 --- a/programs/lodctr/Makefile.in +++ b/programs/lodctr/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = lodctr.exe -APPMODE = -mconsole -municode +APPMODE = -mconsole IMPORTS = loadperf kernel32 C_SRCS = lodctr_main.c diff --git a/programs/lodctr/lodctr_main.c b/programs/lodctr/lodctr_main.c index de5d242..e683873 100644 --- a/programs/lodctr/lodctr_main.c +++ b/programs/lodctr/lodctr_main.c @@ -19,7 +19,7 @@ #include <windows.h> #include <loadperf.h> -int wmain(int argc, WCHAR *argv[]) +int main( int argc, char *argv[] ) { return LoadPerfCounterTextStringsW(GetCommandLineW(), FALSE); } diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 2bd6b4c..2c69eda 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oleview.exe -APPMODE = -mwindows -municode +APPMODE = -mwindows IMPORTS = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32 EXTRADEFS = -DUNICODE diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 096a625..e56342c 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -534,8 +534,7 @@ static BOOL InitInstance(HINSTANCE hInst, int nCmdShow) return TRUE; } -int APIENTRY wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, - LPWSTR lpCmdLine, int nCmdShow) +int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow) { MSG msg; HANDLE hAccelTable; diff --git a/programs/unlodctr/Makefile.in b/programs/unlodctr/Makefile.in index 4e284a5..b67ce79 100644 --- a/programs/unlodctr/Makefile.in +++ b/programs/unlodctr/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = unlodctr.exe -APPMODE = -mconsole -municode +APPMODE = -mconsole IMPORTS = loadperf kernel32 C_SRCS = unlodctr_main.c diff --git a/programs/unlodctr/unlodctr_main.c b/programs/unlodctr/unlodctr_main.c index 1e33b1c..bc6a966 100644 --- a/programs/unlodctr/unlodctr_main.c +++ b/programs/unlodctr/unlodctr_main.c @@ -19,7 +19,7 @@ #include <windows.h> #include <loadperf.h> -int wmain(int argc, WCHAR *argv[]) +int main( int argc, char *argv[] ) { return UnloadPerfCounterTextStringsW(GetCommandLineW(), FALSE); }

1 0